lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-22 23:05:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

all: use tradeStats constructor

Browse Source
This commit is contained in:
c9s 2022-07-05 11:14:50 +08:00
parent bfd64813f8
commit 193703a9a0
No known key found for this signature in database
GPG Key ID: 7385E7E464CB0A54
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/bbgo/order_executor_general.go
View File

@ -53,7 +53,8 @@ func (e *GeneralOrderExecutor) BindTradeStats(tradeStats *types.TradeStats) {
if profit == nil { if profit == nil {
return return
} }
tradeStats.Add(profit.Profit)
tradeStats.Add(profit)
}) })
} }

2
pkg/strategy/pivotshort/strategy.go
View File

@ -235,7 +235,7 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor bbgo.OrderExecutor, se
} }
if s.TradeStats == nil { if s.TradeStats == nil {
s.TradeStats = &types.TradeStats{} s.TradeStats = types.NewTradeStats(s.Symbol)
} }
// StrategyController // StrategyController

2
pkg/strategy/rsmaker/strategy.go
View File

@ -413,7 +413,7 @@ func (s *Strategy) Run(ctx context.Context, _ bbgo.OrderExecutor, session *bbgo.
} }
if s.TradeStats == nil { if s.TradeStats == nil {
s.TradeStats = &types.TradeStats{} s.TradeStats = types.NewTradeStats(s.Symbol)
} }
// initial required information // initial required information

2
pkg/strategy/support/strategy.go
View File

@ -334,7 +334,7 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor bbgo.OrderExecutor, se
// trade stats // trade stats
if s.TradeStats == nil { if s.TradeStats == nil {
s.TradeStats = &types.TradeStats{} s.TradeStats = types.NewTradeStats(s.Symbol)
} }
s.orderExecutor = bbgo.NewGeneralOrderExecutor(session, s.Symbol, ID, instanceID, s.Position) s.orderExecutor = bbgo.NewGeneralOrderExecutor(session, s.Symbol, ID, instanceID, s.Position)

15
pkg/types/trade_stats.go
View File

@ -9,6 +9,7 @@ import (
// TODO: Add more stats from the reference: // TODO: Add more stats from the reference:
// See https://www.metatrader5.com/en/terminal/help/algotrading/testing_report // See https://www.metatrader5.com/en/terminal/help/algotrading/testing_report
type TradeStats struct { type TradeStats struct {
Symbol string `json:"symbol"`
WinningRatio fixedpoint.Value `json:"winningRatio" yaml:"winningRatio"` WinningRatio fixedpoint.Value `json:"winningRatio" yaml:"winningRatio"`
NumOfLossTrade int `json:"numOfLossTrade" yaml:"numOfLossTrade"` NumOfLossTrade int `json:"numOfLossTrade" yaml:"numOfLossTrade"`
NumOfProfitTrade int `json:"numOfProfitTrade" yaml:"numOfProfitTrade"` NumOfProfitTrade int `json:"numOfProfitTrade" yaml:"numOfProfitTrade"`
@ -22,7 +23,19 @@ type TradeStats struct {
TotalNetProfit fixedpoint.Value `json:"totalNetProfit" yaml:"totalNetProfit"` TotalNetProfit fixedpoint.Value `json:"totalNetProfit" yaml:"totalNetProfit"`
} }
func (s *TradeStats) Add(pnl fixedpoint.Value) { func NewTradeStats(symbol string) *TradeStats {
return &TradeStats{Symbol: symbol}
}
func (s *TradeStats) Add(profit *Profit) {
if profit.Symbol != s.Symbol {
return
}
s.add(profit.Profit)
}
func (s *TradeStats) add(pnl fixedpoint.Value) {
if pnl.Sign() > 0 { if pnl.Sign() > 0 {
s.NumOfProfitTrade++ s.NumOfProfitTrade++
s.Profits = append(s.Profits, pnl) s.Profits = append(s.Profits, pnl)