From aa69177436c42b09237a60199116c105931c7454 Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 19 Jul 2018 13:14:21 +0200 Subject: [PATCH] Properly check emptyness and adjust floatfmt --- freqtrade/optimize/backtesting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py index d60ce9a54..83b543136 100644 --- a/freqtrade/optimize/backtesting.py +++ b/freqtrade/optimize/backtesting.py @@ -88,7 +88,7 @@ class Backtesting(object): """ stake_currency = str(self.config.get('stake_currency')) - floatfmt = ('s', 'd', '.2f', '.2f', '.8f', '.1f', '.1f', '.1f') + floatfmt = ('s', 'd', '.2f', '.2f', '.8f', 'd', '.1f', '.1f') tabular_data = [] headers = ['pair', 'buy count', 'avg profit %', 'cum profit %', 'total profit ' + stake_currency, 'avg duration', 'profit', 'loss'] @@ -101,7 +101,7 @@ class Backtesting(object): result.profit_percent.sum() * 100.0, result.profit_abs.sum(), str(timedelta( - minutes=round(result.trade_duration.mean()))) if len(result) else 'nan', + minutes=round(result.trade_duration.mean()))) if not result.empty else '0:00', len(result[result.profit_abs > 0]), len(result[result.profit_abs < 0]) ]) @@ -114,7 +114,7 @@ class Backtesting(object): results.profit_percent.sum() * 100.0, results.profit_abs.sum(), str(timedelta( - minutes=round(results.trade_duration.mean()))) if len(results) else 'nan', + minutes=round(results.trade_duration.mean()))) if not results.empty else '0:00', len(results[results.profit_abs > 0]), len(results[results.profit_abs < 0]) ])