diff --git a/quick_trade/plots.py b/quick_trade/plots.py index 168c0767..4723eb68 100644 --- a/quick_trade/plots.py +++ b/quick_trade/plots.py @@ -264,5 +264,3 @@ def plot_area(self, t.strategy_ichimoku() t.backtest() - time.sleep(1) - print('aboba') diff --git a/quick_trade/trading_sys.py b/quick_trade/trading_sys.py index 18da7317..2c52c592 100644 --- a/quick_trade/trading_sys.py +++ b/quick_trade/trading_sys.py @@ -8,7 +8,6 @@ # more docs and examples # decimal # 3.9 -# subplot plot directory # decorator for strategies without exit condition (not converted data) from copy import copy from datetime import datetime @@ -388,11 +387,7 @@ def backtest(self, else: self.winrate = 0 utils.logger.error('0 trades in %s', self) - self._info = f"""losses: {self.losses} -trades: {self.trades} -profits: {self.profits} -mean year percentage profit: {self.year_profit}% -winrate: {self.winrate}%""" + self._info = utils.INFO_TEXT.format(self.losses, self.trades, self.profits, self.year_profit, self.winrate) utils.logger.info('trader info: %s', self._info) if print_out: print(self._info) @@ -418,8 +413,8 @@ def backtest(self, self.fig.plot_deposit() self.fig.plot_returns() - if show: - self.fig.show() + if show: + self.fig.show() return self.backtest_out diff --git a/quick_trade/utils.py b/quick_trade/utils.py index 2ce59f08..5a007fb0 100644 --- a/quick_trade/utils.py +++ b/quick_trade/utils.py @@ -139,7 +139,13 @@ LOWER_BB_WIDTH: float = 2 LOWER_BB_ALPHA: float = 1.0 -__version__: str = "6.0.0" +INFO_TEXT: str = """losses: {} +trades: {} +profits: {} +mean year percentage profit: {}% +winrate: {}%""" # .format(Trader.losses, Trader.trades, Trader.profits, Trader.year_profit, Trader.winrate) + +__version__: str = "6.0.1" __author__: str = 'Vlad Kochetov' __credits__: List[str] = [ "Hemerson Tacon -- Stack overflow", diff --git a/setup.py b/setup.py index a58a48aa..863efd40 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ with open('README.md') as file: long_desc = file.read() -__version__ = "6.0.0" +__version__ = "6.0.1" setup( name='quick_trade',