Skip to content

Commit

Permalink
6.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
VladKochetov007 committed Jul 9, 2021
1 parent 8f6cefb commit a39ca0f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
2 changes: 0 additions & 2 deletions quick_trade/plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,5 +264,3 @@ def plot_area(self,

t.strategy_ichimoku()
t.backtest()
time.sleep(1)
print('aboba')
11 changes: 3 additions & 8 deletions quick_trade/trading_sys.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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

Expand Down
8 changes: 7 additions & 1 deletion quick_trade/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit a39ca0f

Please sign in to comment.