style: data/statictimeseries: update

grokify · Jun 14, 2021 · 8cfe64a · 8cfe64a
1 parent 72ce08c
commit 8cfe64a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/data/statictimeseries/data_series.go b/data/statictimeseries/data_series.go
@@ -55,7 +55,6 @@ func (ds *DataSeries) SetSeriesName(seriesName string) {
 
 // Keys returns a sorted listed of Item keys.
 func (ds *DataSeries) Keys() []string {
-	// maputil.StringKeysSorted(series.ItemMap)
 	keys := []string{}
 	for key := range ds.ItemMap {
 		keys = append(keys, key)
@@ -196,7 +195,7 @@ func (ds *DataSeries) OneItemMaxValue() (DataItem, error) {
 	return max, nil
 }
 
-func (ds *DataSeries) GetTimeSlice(sortSlice bool) timeutil.TimeSlice {
+func (ds *DataSeries) TimeSlice(sortSlice bool) timeutil.TimeSlice {
 	times := timeutil.TimeSlice{}
 	for _, item := range ds.ItemMap {
 		times = append(times, item.Time)
@@ -257,7 +256,7 @@ func (ds *DataSeries) ToMonthCumulative(inflate bool, timesInput ...time.Time) (
 			return newDataSeries, err
 		}
 	} else {
-		min, max, err = timeutil.TimeSliceMinMax(dsMonth.GetTimeSlice(false))
+		min, max, err = timeutil.TimeSliceMinMax(dsMonth.TimeSlice(false))
 		if err != nil {
 			return newDataSeries, err
 		}
@@ -376,12 +375,6 @@ func (ds *DataSeries) ItemTimes() []time.Time {
 	return times
 }
 
-/*
-func DataSeriesMinMaxTimes(series *DataSeries) (time.Time, time.Time) {
-	return timeutil.SliceMinMax(DataSeriesItemTimes(series))
-}
-*/
-
 func (ds *DataSeries) MinMaxTimes() (time.Time, time.Time) {
 	return timeutil.SliceMinMax(ds.ItemTimes())
 }

diff --git a/data/statictimeseries/data_series_set.go b/data/statictimeseries/data_series_set.go
@@ -68,7 +68,7 @@ func (set *DataSeriesSet) AddDataSeries(dataSeries ...DataSeries) error {
 }
 
 func (set *DataSeriesSet) Inflate() {
-	set.Times = set.GetTimeSlice(true)
+	set.Times = set.TimeSlice(true)
 	if len(set.Order) > 0 {
 		set.Order = stringsutil.SliceCondenseSpace(set.Order, true, false)
 	} else {
@@ -103,7 +103,7 @@ func (set *DataSeriesSet) GetSeriesByIndex(index int) (DataSeries, error) {
 	return DataSeries{}, fmt.Errorf("E_CANNOT_FIND_INDEX_[%d]_SET_COUNT_[%d]", index, len(set.Order))
 }
 
-func (set *DataSeriesSet) GetItem(seriesName, rfc3339 string) (DataItem, error) {
+func (set *DataSeriesSet) Item(seriesName, rfc3339 string) (DataItem, error) {
 	di := DataItem{}
 	dss, ok := set.Series[seriesName]
 	if !ok {
@@ -116,7 +116,7 @@ func (set *DataSeriesSet) GetItem(seriesName, rfc3339 string) (DataItem, error)
 	return item, nil
 }
 
-func (set *DataSeriesSet) GetTimeSlice(sortAsc bool) sortutil.TimeSlice {
+func (set *DataSeriesSet) TimeSlice(sortAsc bool) sortutil.TimeSlice {
 	times := []time.Time{}
 	for _, ds := range set.Series {
 		for _, item := range ds.ItemMap {

diff --git a/data/statictimeseries/data_series_set_mod.go b/data/statictimeseries/data_series_set_mod.go
@@ -16,7 +16,7 @@ func (set *DataSeriesSet) ToMonth(inflate bool) DataSeriesSet {
 	for name, ds := range set.Series {
 		newDss.Series[name] = ds.ToMonth(inflate)
 	}
-	newDss.Times = newDss.GetTimeSlice(true)
+	newDss.Times = newDss.TimeSlice(true)
 	return newDss
 }
 
@@ -37,12 +37,12 @@ func (set *DataSeriesSet) ToMonthCumulative(popLast, inflate bool) (DataSeriesSe
 	if popLast {
 		newDss.PopLast()
 	}
-	newDss.Times = newDss.GetTimeSlice(true)
+	newDss.Times = newDss.TimeSlice(true)
 	return newDss, nil
 }
 
 func (set *DataSeriesSet) PopLast() {
-	times := set.GetTimeSlice(true)
+	times := set.TimeSlice(true)
 	if len(times) == 0 {
 		return
 	}

diff --git a/data/statictimeseries/data_series_set_report.go b/data/statictimeseries/data_series_set_report.go
@@ -181,7 +181,7 @@ func (dss *DataSeriesSet) ToTable(opts *DssTableOpts) (table.Table, error) {
 		lineTotal := float64(0)
 		seriesValues := []float64{}
 		for _, seriesName := range seriesNames {
-			item, err := dss.GetItem(seriesName, rfc3339)
+			item, err := dss.Item(seriesName, rfc3339)
 			if err == nil {
 				if item.IsFloat {
 					line = append(line, fmt.Sprintf("%.10f", item.ValueFloat))