From 293717c3efb323341b485d12f1bd6e2c447cfcdf Mon Sep 17 00:00:00 2001 From: Bemhreth Date: Wed, 26 Jan 2022 16:44:33 +0300 Subject: [PATCH] changes implemented --- user_data/strategies/Strategy002.py | 11 ++++++----- user_data/strategies/Strategy003.py | 8 ++++++-- user_data/strategies/Strategy004.py | 10 ++++++---- user_data/strategies/util.py | 30 ++++++++++++++--------------- 4 files changed, 33 insertions(+), 26 deletions(-) diff --git a/user_data/strategies/Strategy002.py b/user_data/strategies/Strategy002.py index 83ba512a1..8c2f40035 100644 --- a/user_data/strategies/Strategy002.py +++ b/user_data/strategies/Strategy002.py @@ -12,11 +12,9 @@ import talib.abstract as ta import freqtrade.vendor.qtpylib.indicators as qtpylib import numpy # noqa from datetime import datetime -import subprocess -import threading - -from user_data.strategies.util import launcher, _perform_launcher +from user_data.strategies.util import launch, back_test +from config import Config class Strategy002(IStrategy): @@ -168,7 +166,10 @@ class Strategy002(IStrategy): mode = "test" coin = pair.split("/")[0] brain = "Freq_" + self.__class__.__name__ - launcher(mode, current_time, coin, brain) + if Config.IS_BACKTEST: + back_test(current_time, coin, brain) + else: + launch(mode, coin, brain) return True diff --git a/user_data/strategies/Strategy003.py b/user_data/strategies/Strategy003.py index 3e3b84236..d6e8d5e1b 100644 --- a/user_data/strategies/Strategy003.py +++ b/user_data/strategies/Strategy003.py @@ -14,7 +14,8 @@ import numpy # noqa from datetime import datetime import subprocess -from user_data.strategies.util import IS_BACKTEST, back_tester, launcher +from user_data.strategies.util import back_test, launch +from config import Config class Strategy003(IStrategy): @@ -181,5 +182,8 @@ class Strategy003(IStrategy): mode = "test" coin = pair.split("/")[0] brain = "Freq_" + self.__class__.__name__ - launcher(mode, current_time, coin, brain) + if Config.IS_BACKTEST: + back_test(current_time, coin, brain) + else: + launch(mode, coin, brain) return True \ No newline at end of file diff --git a/user_data/strategies/Strategy004.py b/user_data/strategies/Strategy004.py index ab68fec7b..1d0ae378d 100644 --- a/user_data/strategies/Strategy004.py +++ b/user_data/strategies/Strategy004.py @@ -7,12 +7,11 @@ from functools import reduce from pandas import DataFrame # -------------------------------- from datetime import datetime -import subprocess import talib.abstract as ta -from user_data.strategies.util import IS_BACKTEST, back_tester, launcher - +from user_data.strategies.util import back_test, launch +from config import Config class Strategy004(IStrategy): """ @@ -181,5 +180,8 @@ class Strategy004(IStrategy): mode = "test" coin = pair.split("/")[0] brain = "Freq_" + self.__class__.__name__ - launcher(mode, current_time, coin, brain) + if Config.IS_BACKTEST: + back_test(current_time, coin, brain) + else: + launch(mode, coin, brain) return True diff --git a/user_data/strategies/util.py b/user_data/strategies/util.py index 215786411..dd88d6d47 100644 --- a/user_data/strategies/util.py +++ b/user_data/strategies/util.py @@ -2,24 +2,24 @@ import subprocess import threading from user_data.strategies.config import Config -def launcher(mode, coin, brain, date_time): - if Config.IS_BACKTEST: - if Config.IS_PARRALER_EXECUTION: - threading.Thread(target=back_tester, args=(mode, coin, brain, date_time)).start() - else: - date = str(date_time) - date = date.replace(" ", "#") - subprocess.call("python3 "+ Config.EXECUTION_PATH + "back_tester.py " + date + " " + coin + " " + brain + " 0.45 3", shell=True) +def launch(mode, coin, brain): + if Config.IS_PARRALER_EXECUTION: + threading.Thread(target=_perform_launch, args=(mode, coin, brain)).start() else: - if Config.IS_PARRALER_EXECUTION: - threading.Thread(target=_perform_launcher, args=(mode, coin, brain)).start() - else: - subprocess.call("python3 "+Config.EXECUTION_PATH+"launcher.py " + mode + " " + coin + " " + brain, shell=True) - -def _perform_launcher(mode, coin, brain): subprocess.call("python3 "+Config.EXECUTION_PATH+"launcher.py " + mode + " " + coin + " " + brain, shell=True) -def back_tester(date_time, coin, brain): +def _perform_launch(mode, coin, brain): + subprocess.call("python3 "+Config.EXECUTION_PATH+"launcher.py " + mode + " " + coin + " " + brain, shell=True) + +def _perform_back_test(date_time, coin, brain): date = str(date_time) date = date.replace(" ", "#") subprocess.call("python3 "+ Config.EXECUTION_PATH + "back_tester.py " + date + " " + coin + " " + brain + " 0.45 3", shell=True) + +def back_test(date_time, coin, brain): + if Config.IS_PARRALER_EXECUTION: + threading.Thread(target=_perform_back_test, args=(coin, brain, date_time)).start() + else: + date = str(date_time) + date = date.replace(" ", "#") + subprocess.call("python3 "+ Config.EXECUTION_PATH + "back_tester.py " + date + " " + coin + " " + brain + " 0.45 3", shell=True)