simplify: timeseries: cnvert to TimeItem.Int64() and TimeItem.Float64()

Author: grokify

data/timeseries/interval/xox_month.go

@@ -24,7 +24,7 @@ func NewXoXTimeSeries(ds timeseries.TimeSeries) (XoXGrowth, error) {
 		if err != nil {
 			return xox, errors.Wrap(err, "timeseries.NewXoXTimeSeries")
 		}
-		xoxPoint := XoxPoint{Time: dateNow, Value: itemNow.ValueInt64()}
+		xoxPoint := XoxPoint{Time: dateNow, Value: itemNow.Int64()}
 
 		quarterAgo := month.MonthBegin(dateNow, -3)
 		yearAgo := month.MonthBegin(dateNow, -12)
@@ -34,26 +34,26 @@ func NewXoXTimeSeries(ds timeseries.TimeSeries) (XoXGrowth, error) {
 			monthAgo := month.MonthBegin(dateNow, -1)
 			xoxPoint.TimeMonthAgo = monthAgo
 			if itemMonthAgo, ok := ds.ItemMap[monthAgo.Format(time.RFC3339)]; ok {
-				xoxPoint.MMAgoValue = itemMonthAgo.ValueInt64()
-				xoxPoint.MNowValue = itemNow.ValueInt64()
-				xoxPoint.MOldValue = itemMonthAgo.ValueInt64()
-				xoxPoint.MoM = mathutil.PercentChangeToXoX(itemNow.ValueFloat64() / itemMonthAgo.ValueFloat64())
-				xoxPoint.MoMAggregate = mathutil.PercentChangeToXoX(itemNow.ValueFloat64() / itemMonthAgo.ValueFloat64())
+				xoxPoint.MMAgoValue = itemMonthAgo.Int64()
+				xoxPoint.MNowValue = itemNow.Int64()
+				xoxPoint.MOldValue = itemMonthAgo.Int64()
+				xoxPoint.MoM = mathutil.PercentChangeToXoX(itemNow.Float64() / itemMonthAgo.Float64())
+				xoxPoint.MoMAggregate = mathutil.PercentChangeToXoX(itemNow.Float64() / itemMonthAgo.Float64())
 			}
 		}
 		if itemMonthQuarterAgo, ok := ds.ItemMap[quarterAgo.Format(time.RFC3339)]; ok {
-			xoxPoint.MQAgoValue = itemMonthQuarterAgo.ValueInt64()
+			xoxPoint.MQAgoValue = itemMonthQuarterAgo.Int64()
 			xoxPoint.QNowValue = AggregatePriorMonths(ds, dateNow, 3)
 			xoxPoint.QOldValue = AggregatePriorMonths(ds, month.MonthBegin(dateNow, -3), 3)
-			xoxPoint.QoQ = mathutil.PercentChangeToXoX(itemNow.ValueFloat64() / itemMonthQuarterAgo.ValueFloat64())
+			xoxPoint.QoQ = mathutil.PercentChangeToXoX(itemNow.Float64() / itemMonthQuarterAgo.Float64())
 			xoxPoint.QoQAggregate = mathutil.PercentChangeToXoX(
 				float64(xoxPoint.QNowValue) / float64(xoxPoint.QOldValue))
 		}
 		if itemMonthYearAgo, ok := ds.ItemMap[yearAgo.Format(time.RFC3339)]; ok {
-			xoxPoint.MYAgoValue = itemMonthYearAgo.ValueInt64()
+			xoxPoint.MYAgoValue = itemMonthYearAgo.Int64()
 			xoxPoint.YNowValue = AggregatePriorMonths(ds, dateNow, 12)
 			xoxPoint.YOldValue = AggregatePriorMonths(ds, month.MonthBegin(dateNow, -12), 12)
-			xoxPoint.YoY = mathutil.PercentChangeToXoX(itemNow.ValueFloat64() / itemMonthYearAgo.ValueFloat64())
+			xoxPoint.YoY = mathutil.PercentChangeToXoX(itemNow.Float64() / itemMonthYearAgo.Float64())
 			xoxPoint.YoYAggregate = mathutil.PercentChangeToXoX(
 				float64(xoxPoint.YNowValue) / float64(xoxPoint.YOldValue))
 			/*

data/timeseries/time_item.go

@@ -15,14 +15,14 @@ type TimeItem struct {
 	ValueFloat    float64
 }
 
-func (item *TimeItem) ValueInt64() int64 {
+func (item *TimeItem) Int64() int64 {
 	if item.IsFloat {
 		return int64(item.ValueFloat)
 	}
 	return item.Value
 }
 
-func (item *TimeItem) ValueFloat64() float64 {
+func (item *TimeItem) Float64() float64 {
 	if item.IsFloat {
 		return item.ValueFloat
 	}

data/timeseries/time_series.go

@@ -178,7 +178,7 @@ func (ts *TimeSeries) LastItem(skipIfTimePartialValueLessPrev bool) (TimeItem, e
 			dtNow = month.MonthBegin(dtNow, 0)
 		}
 		if itemLast.Time.Equal(dtNow) {
-			if itemLast.ValueInt64() > itemPrev.ValueInt64() {
+			if itemLast.Int64() > itemPrev.Int64() {
 				return itemLast, nil
 			} else {
 				return itemPrev, nil

data/timeseries/time_series_set_report.go

@@ -214,8 +214,8 @@ func (set *TimeSeriesSet) ToTable(opts *TimeSeriesSetTableOpts) (table.Table, er
 				} else {
 					line = append(line, strconv.Itoa(int(item.Value)))
 				}
-				lineTotal += item.ValueFloat64()
-				seriesValues = append(seriesValues, item.ValueFloat64())
+				lineTotal += item.Float64()
+				seriesValues = append(seriesValues, item.Float64())
 			}
 		}
 		if opts.TotalInclude {

data/timeseries/xoxconv/xox_time_series.go

@@ -4,15 +4,13 @@ import (
 	"time"
 
 	"github.com/grokify/gocharts/data/timeseries"
-	"github.com/grokify/simplego/fmt/fmtutil"
 	"github.com/grokify/simplego/time/timeutil"
 )
 
 // TimeSeriesXoX converts a `timeseries.TimeSeries`
 // XoX statistics.
 func TimeSeriesXoX(ts timeseries.TimeSeries) (XOXFloat64, error) {
 	tsMonth := ts.ToMonth(true)
-	fmtutil.PrintJSON(tsMonth)
 
 	xox := XOXFloat64{}
 	tiNow, err := tsMonth.Last()
@@ -22,35 +20,35 @@ func TimeSeriesXoX(ts timeseries.TimeSeries) (XOXFloat64, error) {
 	xox.Now = Compare{
 		XoX:   "NOW",
 		Time:  tiNow.Time,
-		Value: tiNow.ValueFloat64()}
+		Value: tiNow.Float64()}
 	mago, err := tsMonth.Get(timeutil.TimeDt6SubNMonths(tiNow.Time, 1))
 	if err == nil {
 		xox.Month = Compare{
 			XoX:   "MOM",
 			Time:  mago.Time,
-			Value: mago.ValueFloat64()}
-		if mago.ValueFloat64() != 0 {
-			xox.Month.Change = (tiNow.ValueFloat64() - mago.ValueFloat64()) / mago.ValueFloat64()
+			Value: mago.Float64()}
+		if mago.Float64() != 0 {
+			xox.Month.Change = (tiNow.Float64() - mago.Float64()) / mago.Float64()
 		}
 	}
 	qago, err := tsMonth.Get(timeutil.TimeDt6SubNMonths(tiNow.Time, 3))
 	if err == nil {
 		xox.Quarter = Compare{
 			XoX:   "QOQ",
 			Time:  qago.Time,
-			Value: qago.ValueFloat64()}
-		if qago.ValueFloat64() != 0 {
-			xox.Quarter.Change = (tiNow.ValueFloat64() - qago.ValueFloat64()) / qago.ValueFloat64()
+			Value: qago.Float64()}
+		if qago.Float64() != 0 {
+			xox.Quarter.Change = (tiNow.Float64() - qago.Float64()) / qago.Float64()
 		}
 	}
 	yago, err := tsMonth.Get(timeutil.TimeDt6SubNMonths(tiNow.Time, 12))
 	if err == nil {
 		xox.Year = Compare{
 			XoX:   "YOY",
 			Time:  yago.Time,
-			Value: yago.ValueFloat64()}
-		if yago.ValueFloat64() != 0 {
-			xox.Year.Change = (tiNow.ValueFloat64() - yago.ValueFloat64()) / yago.ValueFloat64()
+			Value: yago.Float64()}
+		if yago.Float64() != 0 {
+			xox.Year.Change = (tiNow.Float64() - yago.Float64()) / yago.Float64()
 		}
 	}
 	return xox, nil