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

fix: tv chart, price direction in backtest

Browse Source
This commit is contained in:
zenix 2022-05-25 01:48:14 +09:00
parent 99122f44bc
commit c6bad0ba08
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/backtest-report/components/TradingViewChart.tsx
View File

@ -155,7 +155,7 @@ const ordersToMarkets = (interval: string, orders: Array<Order> | void): Array<M
// var markers = [{ time: data[data.length - 48].time, position: 'aboveBar', color: '#f68410', shape: 'circle', text: 'D' }]; // var markers = [{ time: data[data.length - 48].time, position: 'aboveBar', color: '#f68410', shape: 'circle', text: 'D' }];
for (let i = 0; i < orders.length; i++) { for (let i = 0; i < orders.length; i++) {
let order = orders[i]; let order = orders[i];
let t = order.update_time.getTime() / 1000.0; let t = (order.update_time || order.time).getTime() / 1000.0;
let lastMarker = markers.length > 0 ? markers[markers.length - 1] : null; let lastMarker = markers.length > 0 ? markers[markers.length - 1] : null;
if (lastMarker) { if (lastMarker) {
let remainder = lastMarker.time % intervalSecs; let remainder = lastMarker.time % intervalSecs;
@ -264,7 +264,7 @@ const positionBaseHistoryToLineData = (interval: string, hs: Array<PositionHisto
} }
// ignore duplicated entry // ignore duplicated entry
if (hs[i].time.getTime() === hs[i - 1].time.getTime()) { if (i > 0 && hs[i].time.getTime() === hs[i - 1].time.getTime()) {
continue continue
} }
@ -296,7 +296,7 @@ const positionAverageCostHistoryToLineData = (interval: string, hs: Array<Positi
} }
// ignore duplicated entry // ignore duplicated entry
if (hs[i].time.getTime() === hs[i - 1].time.getTime()) { if (i > 0 && hs[i].time.getTime() === hs[i - 1].time.getTime()) {
continue continue
} }

4
pkg/backtest/matching.go
View File

@ -414,9 +414,9 @@ func (m *SimplePriceMatching) processKLine(kline types.KLine) {
m.LastPrice = kline.Open m.LastPrice = kline.Open
} else { } else {
if m.LastPrice.Compare(kline.Open) > 0 { if m.LastPrice.Compare(kline.Open) > 0 {
m.BuyToPrice(kline.Open)
} else {
m.SellToPrice(kline.Open) m.SellToPrice(kline.Open)
} else {
m.BuyToPrice(kline.Open)
} }
} }