fix bug

Author: anyongjin

core.go

@@ -11,8 +11,13 @@ func (e *BarEnv) OnBar(barMs int64, open, high, low, close, volume, info float64
 	if e.TimeStop > barMs {
 		return fmt.Errorf("%s/%s old Bar Receive: %d, Current: %d", e.Symbol, e.TimeFrame, barMs, e.TimeStop)
 	}
-	e.TimeStart = barMs
-	e.TimeStop = barMs + e.TFMSecs
+	e.OnBar2(barMs, barMs+e.TFMSecs, open, high, low, close, volume, info)
+	return nil
+}
+
+func (e *BarEnv) OnBar2(barMS, endMS int64, open, high, low, close, volume, info float64) {
+	e.TimeStart = barMS
+	e.TimeStop = endMS
 	e.BarNum += 1
 	if e.Open == nil {
 		e.Open = e.NewSeries([]float64{open})
@@ -26,21 +31,20 @@ func (e *BarEnv) OnBar(barMs int64, open, high, low, close, volume, info float64
 			e.MaxCache = 1000
 		}
 	} else {
-		e.Open.Time = barMs
+		e.Open.Time = barMS
 		e.Open.Data = append(e.Open.Data, open)
-		e.High.Time = barMs
+		e.High.Time = barMS
 		e.High.Data = append(e.High.Data, high)
-		e.Low.Time = barMs
+		e.Low.Time = barMS
 		e.Low.Data = append(e.Low.Data, low)
-		e.Close.Time = barMs
+		e.Close.Time = barMS
 		e.Close.Data = append(e.Close.Data, close)
-		e.Volume.Time = barMs
+		e.Volume.Time = barMS
 		e.Volume.Data = append(e.Volume.Data, volume)
-		e.Info.Time = barMs
+		e.Info.Time = barMS
 		e.Info.Data = append(e.Info.Data, info)
 		e.TrimOverflow()
 	}
-	return nil
 }
 
 func (e *BarEnv) Reset() {
@@ -126,6 +130,31 @@ func (e *BarEnv) Clone() *BarEnv {
 	return res
 }
 
+// ResetTo reset all Series to given(exclude ohlcv)
+func (e *BarEnv) ResetTo(env *BarEnv) {
+	rootIds := map[int]bool{
+		env.Open.ID:   true,
+		env.High.ID:   true,
+		env.Low.ID:    true,
+		env.Close.ID:  true,
+		env.Volume.ID: true,
+		env.Info.ID:   true,
+	}
+	for id, s := range env.Items {
+		if _, ok := rootIds[id]; ok {
+			continue
+		}
+		delete(e.Items, id)
+		s.CopyTo(e)
+	}
+	e.Open.loadEnvSubs()
+	e.High.loadEnvSubs()
+	e.Low.loadEnvSubs()
+	e.Close.loadEnvSubs()
+	e.Volume.loadEnvSubs()
+	e.Info.loadEnvSubs()
+}
+
 func (s *Series) Set(obj interface{}) *Series {
 	if !s.Cached() {
 		return s.Append(obj)
@@ -411,6 +440,16 @@ func (s *Series) CopyTo(e *BarEnv) *Series {
 	return res
 }
 
+func (s *Series) loadEnvSubs() {
+	for _, idMap := range s.Subs {
+		for id := range idMap {
+			if dup, ok := s.Env.Items[id]; ok {
+				idMap[id] = dup
+			}
+		}
+	}
+}
+
 /*
 Cross 计算最近一次交叉的距离。比较对象必须是常数或Series对象
 返回值：正数上穿，负数下穿，0表示未知或重合；abs(ret) - 1表示交叉点与当前bar的距离

sta_inds.go

@@ -51,8 +51,8 @@ func Sum(obj *Series, period int) *Series {
 		sta = &sumState{}
 		res.More = sta
 		res.DupMore = func(more interface{}) interface{} {
-			sta := more.(*sumState)
-			return &sumState{sta.sumVal, append([]float64{}, sta.arr...)}
+			s := more.(*sumState)
+			return &sumState{s.sumVal, append([]float64{}, s.arr...)}
 		}
 	}
 	curVal := obj.Get(0)