Skip to content

Commit

Permalink
fix: window update in indicators. add: cumulative average, triangular…
Browse files Browse the repository at this point in the history
… moving average
  • Loading branch information
zenixls2 committed Apr 26, 2022
1 parent a8f0c71 commit b374177
Show file tree
Hide file tree
Showing 12 changed files with 219 additions and 10 deletions.
15 changes: 15 additions & 0 deletions pkg/indicator/ca_callbacks.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 63 additions & 0 deletions pkg/indicator/cma.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package indicator

import (
"github.com/c9s/bbgo/pkg/types"
)

// Refer: Cumulative Moving Average, Cumulative Average
// Refer: https://en.wikipedia.org/wiki/Moving_average
//go:generate callbackgen -type CA
type CA struct {
Interval types.Interval
Values types.Float64Slice
length float64
UpdateCallbacks []func(value float64)
}

func (inc *CA) Update(x float64) {
newVal := (inc.Values.Last()*inc.length + x) / (inc.length + 1.)
inc.length += 1
inc.Values.Push(newVal)
if len(inc.Values) > MaxNumOfEWMA {
inc.Values = inc.Values[MaxNumOfEWMATruncateSize-1:]
}
}

func (inc *CA) Last() float64 {
if len(inc.Values) == 0 {
return 0
}
return inc.Values[len(inc.Values)-1]
}

func (inc *CA) Index(i int) float64 {
if i >= len(inc.Values) {
return 0
}
return inc.Values[len(inc.Values)-1-i]
}

func (inc *CA) Length() int {
return len(inc.Values)
}

var _ types.Series = &CA{}

func (inc *CA) calculateAndUpdate(allKLines []types.KLine) {
for _, k := range allKLines {
inc.Update(k.Close.Float64())
inc.EmitUpdate(inc.Last())
}
}

func (inc *CA) handleKLineWindowUpdate(interval types.Interval, window types.KLineWindow) {
if inc.Interval != interval {
return
}

inc.calculateAndUpdate(window)
}

func (inc *CA) Bind(updater KLineWindowUpdater) {
updater.OnKLineWindowUpdate(inc.handleKLineWindowUpdate)
}
9 changes: 7 additions & 2 deletions pkg/indicator/dema.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,13 @@ func (inc *DEMA) Length() int {
var _ types.Series = &DEMA{}

func (inc *DEMA) calculateAndUpdate(allKLines []types.KLine) {
for _, k := range allKLines {
inc.Update(k.Close.Float64())
if inc.a1 == nil {
for _, k := range allKLines {
inc.Update(k.Close.Float64())
inc.EmitUpdate(inc.Last())
}
} else {
inc.Update(allKLines[len(allKLines)-1].Close.Float64())
inc.EmitUpdate(inc.Last())
}
}
Expand Down
9 changes: 9 additions & 0 deletions pkg/indicator/hull.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,23 @@ func (inc *HULL) Update(value float64) {
}

func (inc *HULL) Last() float64 {
if inc.result == nil {
return 0
}
return inc.result.Last()
}

func (inc *HULL) Index(i int) float64 {
if inc.result == nil {
return 0
}
return inc.result.Index(i)
}

func (inc *HULL) Length() int {
if inc.result == nil {
return 0
}
return inc.result.Length()
}

Expand Down
1 change: 1 addition & 0 deletions pkg/indicator/rma.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"github.com/c9s/bbgo/pkg/types"
)

// Refer: Running Moving Average
//go:generate callbackgen -type RMA
type RMA struct {
types.IntervalWindow
Expand Down
9 changes: 7 additions & 2 deletions pkg/indicator/tema.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,13 @@ func (inc *TEMA) Length() int {
var _ types.Series = &TEMA{}

func (inc *TEMA) calculateAndUpdate(allKLines []types.KLine) {
for _, k := range allKLines {
inc.Update(k.Close.Float64())
if inc.A1 == nil {
for _, k := range allKLines {
inc.Update(k.Close.Float64())
inc.EmitUpdate(inc.Last())
}
} else {
inc.Update(allKLines[len(allKLines)-1].Close.Float64())
inc.EmitUpdate(inc.Last())
}
}
Expand Down
7 changes: 5 additions & 2 deletions pkg/indicator/till.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (inc *TILL) Update(value float64) {
}

func (inc *TILL) Last() float64 {
if inc.e1.Length() == 0 {
if inc.e1 == nil || inc.e1.Length() == 0 {
return 0
}
e3 := inc.e3.Last()
Expand All @@ -64,7 +64,7 @@ func (inc *TILL) Last() float64 {
}

func (inc *TILL) Index(i int) float64 {
if inc.e1.Length() <= i {
if inc.e1 == nil || inc.e1.Length() <= i {
return 0
}
e3 := inc.e3.Index(i)
Expand All @@ -75,6 +75,9 @@ func (inc *TILL) Index(i int) float64 {
}

func (inc *TILL) Length() int {
if inc.e1 == nil {
return 0
}
return inc.e1.Length()
}

Expand Down
73 changes: 73 additions & 0 deletions pkg/indicator/tma.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
package indicator

import (
"github.com/c9s/bbgo/pkg/types"
)

// Refer: Triangular Moving Average
// Refer URL: https://ja.wikipedia.org/wiki/移動平均
//go:generate callbackgen -type TMA
type TMA struct {
types.IntervalWindow
s1 *SMA
s2 *SMA
UpdateCallbacks []func(value float64)
}

func (inc *TMA) Update(value float64) {
if inc.s1 == nil {
w := (inc.Window + 1) / 2
inc.s1 = &SMA{IntervalWindow: types.IntervalWindow{inc.Interval, w}}
inc.s2 = &SMA{IntervalWindow: types.IntervalWindow{inc.Interval, w}}
}

inc.s1.Update(value)
inc.s2.Update(inc.s1.Last())
}

func (inc *TMA) Last() float64 {
if inc.s2 == nil {
return 0
}
return inc.s2.Last()
}

func (inc *TMA) Index(i int) float64 {
if inc.s2 == nil {
return 0
}
return inc.s2.Index(i)
}

func (inc *TMA) Length() int {
if inc.s2 == nil {
return 0
}
return inc.s2.Length()
}

var _ types.Series = &TMA{}

func (inc *TMA) calculateAndUpdate(allKLines []types.KLine) {
if inc.s1 == nil {
for _, k := range allKLines {
inc.Update(k.Close.Float64())
inc.EmitUpdate(inc.Last())
}
} else {
inc.Update(allKLines[len(allKLines)-1].Close.Float64())
inc.EmitUpdate(inc.Last())
}
}

func (inc *TMA) handleKLineWindowUpdate(interval types.Interval, window types.KLineWindow) {
if inc.Interval != interval {
return
}

inc.calculateAndUpdate(window)
}

func (inc *TMA) Bind(updater KLineWindowUpdater) {
updater.OnKLineWindowUpdate(inc.handleKLineWindowUpdate)
}
15 changes: 15 additions & 0 deletions pkg/indicator/tma_callbacks.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions pkg/indicator/vidya.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,13 @@ func (inc *VIDYA) Length() int {
var _ types.Series = &VIDYA{}

func (inc *VIDYA) calculateAndUpdate(allKLines []types.KLine) {
for _, k := range allKLines {
inc.Update(k.Close.Float64())
if inc.input.Length() == 0 {
for _, k := range allKLines {
inc.Update(k.Close.Float64())
inc.EmitUpdate(inc.Last())
}
} else {
inc.Update(allKLines[len(allKLines)-1].Close.Float64())
inc.EmitUpdate(inc.Last())
}
}
Expand Down
1 change: 1 addition & 0 deletions pkg/indicator/wwma.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

// Refer: Welles Wilder's Moving Average
// Refer URL: http://fxcorporate.com/help/MS/NOTFIFO/i_WMA.html
// TODO: Cannot see any difference between RMA and this

const MaxNumOfWWMA = 5_000
const MaxNumOfWWMATruncateSize = 100
Expand Down
18 changes: 16 additions & 2 deletions pkg/indicator/zlema.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,23 @@ type ZLEMA struct {
}

func (inc *ZLEMA) Index(i int) float64 {
if inc.zlema == nil {
return 0
}
return inc.zlema.Index(i)
}

func (inc *ZLEMA) Last() float64 {
if inc.zlema == nil {
return 0
}
return inc.zlema.Last()
}

func (inc *ZLEMA) Length() int {
if inc.zlema == nil {
return 0
}
return inc.zlema.Length()
}

Expand All @@ -49,8 +58,13 @@ func (inc *ZLEMA) Update(value float64) {
var _ types.Series = &ZLEMA{}

func (inc *ZLEMA) calculateAndUpdate(allKLines []types.KLine) {
for _, k := range allKLines {
inc.Update(k.Close.Float64())
if inc.zlema == nil {
for _, k := range allKLines {
inc.Update(k.Close.Float64())
inc.EmitUpdate(inc.Last())
}
} else {
inc.Update(allKLines[len(allKLines)-1].Close.Float64())
inc.EmitUpdate(inc.Last())
}
}
Expand Down

0 comments on commit b374177

Please sign in to comment.