bbgo: update VWMA and add VWMA to the indicator method

22388o · Aug 24, 2022 · 09cc91b · 09cc91b
1 parent 469c6bf
commit 09cc91b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/pkg/bbgo/standard_indicator_set.go b/pkg/bbgo/standard_indicator_set.go
@@ -74,6 +74,13 @@ func (s *StandardIndicatorSet) EWMA(iw types.IntervalWindow) *indicator.EWMA {
 	return inc.(*indicator.EWMA)
 }
 
+// VWMA
+func (s *StandardIndicatorSet) VWMA(iw types.IntervalWindow) *indicator.VWMA {
+	inc := s.allocateSimpleIndicator(&indicator.VWMA{IntervalWindow: iw}, iw)
+	return inc.(*indicator.VWMA)
+}
+
+
 func (s *StandardIndicatorSet) PivotLow(iw types.IntervalWindow) *indicator.PivotLow {
 	inc := s.allocateSimpleIndicator(&indicator.PivotLow{IntervalWindow: iw}, iw)
 	return inc.(*indicator.PivotLow)

diff --git a/pkg/indicator/vwma.go b/pkg/indicator/vwma.go
@@ -70,6 +70,15 @@ func (inc *VWMA) Update(price, volume float64) {
 	inc.Values.Push(vwma)
 }
 
+func (inc *VWMA) PushK(k types.KLine) {
+	if inc.EndTime != zeroTime && k.EndTime.Before(inc.EndTime) {
+		return
+	}
+
+	inc.Update(k.Close.Float64(), k.Volume.Float64())
+}
+
+
 func (inc *VWMA) CalculateAndUpdate(allKLines []types.KLine) {
 	if len(allKLines) < inc.Window {
 		return