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

Merge pull request #628 from c9s/feature/optimizer

Browse Source 
fix: fix summary report intervals
This commit is contained in:
Yo-An Lin 2022-05-20 00:55:53 +08:00 committed by GitHub
commit f38d165960
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/backtest-report/components/ReportDetails.tsx
View File

@ -235,7 +235,7 @@ const ReportDetails = (props: ReportDetailsProps) => {
{ {
reportSummary.symbols.map((symbol: string, i: number) => { reportSummary.symbols.map((symbol: string, i: number) => {
return <TradingViewChart key={i} basePath={props.basePath} runID={props.runID} reportSummary={reportSummary} return <TradingViewChart key={i} basePath={props.basePath} runID={props.runID} reportSummary={reportSummary}
symbol={symbol} intervals={["1m", "5m", "1h"]}/> symbol={symbol}/>
}) })
} }
</div> </div>

4
apps/backtest-report/components/TradingViewChart.js
View File

@ -329,10 +329,8 @@ const TradingViewChart = (props) => {
const chartContainerRef = useRef(); const chartContainerRef = useRef();
const chart = useRef(); const chart = useRef();
const resizeObserver = useRef(); const resizeObserver = useRef();
const [data, setData] = useState(null);
const [currentInterval, setCurrentInterval] = useState('5m'); const [currentInterval, setCurrentInterval] = useState('5m');
const intervals = props.reportSummary.intervals || [];
const intervals = props.intervals || [];
useEffect(() => { useEffect(() => {
if (!chartContainerRef.current || chartContainerRef.current.children.length > 0) { if (!chartContainerRef.current || chartContainerRef.current.children.length > 0) {

1
apps/backtest-report/types/report.ts
View File

@ -28,6 +28,7 @@ export interface ReportSummary {
endTime: Date; endTime: Date;
sessions: string[]; sessions: string[];
symbols: string[]; symbols: string[];
intervals: string[];
initialTotalBalances: BalanceMap; initialTotalBalances: BalanceMap;
finalTotalBalances: BalanceMap; finalTotalBalances: BalanceMap;
symbolReports: SymbolReport[]; symbolReports: SymbolReport[];

10
pkg/cmd/backtest.go
View File

@ -372,7 +372,6 @@ var BacktestCmd = &cobra.Command{
defer func() { _ = ordersTsv.Close() }() defer func() { _ = ordersTsv.Close() }()
_ = ordersTsv.Write(types.Order{}.CsvHeader()) _ = ordersTsv.Write(types.Order{}.CsvHeader())
defer ordersTsv.Flush()
for _, exSource := range exchangeSources { for _, exSource := range exchangeSources {
exSource.Session.UserDataStream.OnOrderUpdate(func(order types.Order) { exSource.Session.UserDataStream.OnOrderUpdate(func(order types.Order) {
if order.Status == types.OrderStatusFilled { if order.Status == types.OrderStatusFilled {
@ -463,14 +462,17 @@ var BacktestCmd = &cobra.Command{
} }
allKLineIntervals := map[types.Interval]struct{}{} allKLineIntervals := map[types.Interval]struct{}{}
for _, interval := range backTestIntervals {
allKLineIntervals[interval] = struct{}{}
}
for _, session := range environ.Sessions() { for _, session := range environ.Sessions() {
for _, sub := range session.Subscriptions { for _, sub := range session.Subscriptions {
if sub.Channel == types.KLineChannel { if sub.Channel == types.KLineChannel {
allKLineIntervals[types.Interval(sub.Options.Interval)] = struct{}{} allKLineIntervals[sub.Options.Interval] = struct{}{}
} }
} }
} }
for interval := range allKLineIntervals { for interval := range allKLineIntervals {
summaryReport.Intervals = append(summaryReport.Intervals, interval) summaryReport.Intervals = append(summaryReport.Intervals, interval)
} }
@ -584,7 +586,7 @@ func createSymbolReport(userConfig *bbgo.Config, session *bbgo.ExchangeSession,
sessionKLineIntervals := map[types.Interval]struct{}{} sessionKLineIntervals := map[types.Interval]struct{}{}
for _, sub := range session.Subscriptions { for _, sub := range session.Subscriptions {
if sub.Channel == types.KLineChannel { if sub.Channel == types.KLineChannel {
sessionKLineIntervals[types.Interval(sub.Options.Interval)] = struct{}{} sessionKLineIntervals[sub.Options.Interval] = struct{}{}
} }
} }