zeni/go-chart
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Make various time utils more generic

Browse source
This commit is contained in:
Felix Hanley 2020-02-12 16:54:55 +11:00
parent 962b9abdec
commit 98ff071acd
1 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
timeutil.go
View file

@ -13,8 +13,8 @@ func TimeMillis(d time.Duration) float64 {
return float64(d) / float64(time.Millisecond) return float64(d) / float64(time.Millisecond)
} }
// DiffHours returns the difference in hours between two times. // DiffDurations returns the difference between two times as a count of durations.
func DiffHours(t1, t2 time.Time) (hours int) { func DiffDurations(t1, t2 time.Time, d time.Duration) int {
t1n := t1.Unix() t1n := t1.Unix()
t2n := t2.Unix() t2n := t2.Unix()
var diff int64 var diff int64
@ -23,7 +23,12 @@ func DiffHours(t1, t2 time.Time) (hours int) {
} else { } else {
diff = t2n - t1n diff = t2n - t1n
} }
return int(diff / (SecondsPerHour)) return int(float64(diff) / d.Seconds())
}
// DiffHours returns the difference in hours between two times.
func DiffHours(t1, t2 time.Time) (hours int) {
return DiffDurations(t1, t2, time.Hour)
} }
// TimeMin returns the minimum and maximum times in a given range. // TimeMin returns the minimum and maximum times in a given range.
@ -118,33 +123,44 @@ func Days(days int) []time.Time {
return values return values
} }
// Hours returns a sequence of times by the hour for a given number of hours // Durations returns a sequence of times for a given number of durations
// after a given start. // after a given start.
func Hours(start time.Time, totalHours int) []time.Time { func Durations(start time.Time, total int, d time.Duration) []time.Time {
times := make([]time.Time, totalHours) times := make([]time.Time, total)
last := start last := start
for i := 0; i < totalHours; i++ { for i := 0; i < total; i++ {
times[i] = last times[i] = last
last = last.Add(time.Hour) last = last.Add(d)
} }
return times return times
} }
// HoursFilled adds zero values for the data bounded by the start and end of the xdata array. // Hours returns a sequence of times by the hour for a given number of hours
func HoursFilled(xdata []time.Time, ydata []float64) ([]time.Time, []float64) { // after a given start.
func Hours(start time.Time, totalHours int) []time.Time {
return Durations(start, totalHours, time.Hour)
}
// DurationsFilled adds zero values for the data bounded by the start and end of the xdata array.
func DurationsFilled(xdata []time.Time, ydata []float64, d time.Duration) ([]time.Time, []float64) {
start, end := TimeMinMax(xdata...) start, end := TimeMinMax(xdata...)
totalHours := DiffHours(start, end) total := DiffDurations(start, end, d)
finalTimes := Hours(start, totalHours+1) finalTimes := Durations(start, total+1, d)
finalValues := make([]float64, totalHours+1) finalValues := make([]float64, total+1)
var hoursFromStart int var durationsFromStart int
for i, xd := range xdata { for i, xd := range xdata {
hoursFromStart = DiffHours(start, xd) durationsFromStart = DiffDurations(start, xd, d)
finalValues[hoursFromStart] = ydata[i] finalValues[durationsFromStart] = ydata[i]
} }
return finalTimes, finalValues return finalTimes, finalValues
} }
// HoursFilled adds zero values for the data bounded by the start and end of the xdata array.
func HoursFilled(xdata []time.Time, ydata []float64) ([]time.Time, []float64) {
return DurationsFilled(xdata, ydata, time.Hour)
}