fixing handling of offset and window

This commit is contained in:
Will Charczuk 2016-07-27 12:44:02 -07:00
parent 6533e951e7
commit fc0f274f51

View File

@ -40,7 +40,7 @@ func (lrs LinearRegressionSeries) Len() int {
// GetWindow returns the window size. // GetWindow returns the window size.
func (lrs LinearRegressionSeries) GetWindow() int { func (lrs LinearRegressionSeries) GetWindow() int {
if lrs.Window == 0 { if lrs.Window == 0 {
return lrs.InnerSeries.Len() return lrs.InnerSeries.Len() - lrs.GetOffset()
} }
return lrs.Window return lrs.Window
} }
@ -69,7 +69,8 @@ func (lrs *LinearRegressionSeries) GetValue(index int) (x, y float64) {
lrs.computeCoefficients() lrs.computeCoefficients()
} }
offset := lrs.GetOffset() offset := lrs.GetOffset()
x, y = lrs.InnerSeries.GetValue(index + offset) effectiveIndex := MinInt(index+offset, lrs.InnerSeries.Len())
x, y = lrs.InnerSeries.GetValue(effectiveIndex)
y = (lrs.m * lrs.normalize(x)) + lrs.b y = (lrs.m * lrs.normalize(x)) + lrs.b
return return
} }