From b0651046a1b5032f1f93fb3ff624c36743c471c2 Mon Sep 17 00:00:00 2001 From: Denis Tereshkin Date: Mon, 17 Dec 2018 13:52:43 +0700 Subject: [PATCH 1/2] Draw bar-based equity --- src/nailab/execution/executor.py | 3 ++- src/nailab/ui/strategywidget.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/nailab/execution/executor.py b/src/nailab/execution/executor.py index a1632db..36079d2 100644 --- a/src/nailab/execution/executor.py +++ b/src/nailab/execution/executor.py @@ -30,6 +30,7 @@ class Executor: results = strategy.get_analyzer('stats').get_result() trades = strategy.get_analyzer('tradeslist').get_result() - return (results, trades) + equity = strategy.get_analyzer('equity').get_result() + return (results, trades, equity) diff --git a/src/nailab/ui/strategywidget.py b/src/nailab/ui/strategywidget.py index 4a9fa9f..800a3f7 100644 --- a/src/nailab/ui/strategywidget.py +++ b/src/nailab/ui/strategywidget.py @@ -174,13 +174,13 @@ class StrategyWidget(QtWidgets.QWidget): def update_equity_chart(self): - pnl = [x['pnl'] for x in self.result[1]] - cumpnl = np.cumsum(pnl) + #pnl = [x['pnl'] for x in self.result[1]] + #cumpnl = np.cumsum(pnl) if self.equity_widget is None: self.equity_widget = EquityChartWidget(self) self.ui.tabs.addTab(self.equity_widget, "Equity") - self.equity_widget.set_data(cumpnl) + self.equity_widget.set_data(self.result[2]) def update_trades_list(self): if self.trades_widget is None: From bb8e6eb263aa1fec3f6602fbd29fc3c8861eeb9b Mon Sep 17 00:00:00 2001 From: Denis Tereshkin Date: Wed, 19 Dec 2018 18:04:08 +0700 Subject: [PATCH 2/2] Add more floating point digits in trades list --- src/nailab/ui/tradeslistwidget.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nailab/ui/tradeslistwidget.py b/src/nailab/ui/tradeslistwidget.py index a312ac3..583bf19 100644 --- a/src/nailab/ui/tradeslistwidget.py +++ b/src/nailab/ui/tradeslistwidget.py @@ -30,8 +30,8 @@ class TradesListWidget(QtWidgets.QWidget): item.setText(1, str(trade["size"])) item.setText(2, trade["security"]) item.setText(3, str(trade["entry_time"])) - item.setText(4, "{:.2f}".format(trade["entry_price"])) + item.setText(4, "{:.4f}".format(trade["entry_price"])) item.setText(5, str(trade["exit_time"])) - item.setText(6, "{:.2f}".format(trade["exit_price"])) - item.setText(7, "{:.2f}".format(trade["pnl"])) + item.setText(6, "{:.4f}".format(trade["exit_price"])) + item.setText(7, "{:.4f}".format(trade["pnl"]))