From 42645aee00fcf9adc3c7014c0af5ba7f1dc34fda Mon Sep 17 00:00:00 2001 From: tef Date: Fri, 4 Feb 2022 06:47:48 -0500 Subject: [PATCH] add Config.IS_EXECUTION --- user_data/strategies/Strategy002.py | 2 +- user_data/strategies/Strategy003.py | 2 +- user_data/strategies/Strategy004.py | 2 +- user_data/strategies/config.py | 3 ++- user_data/strategies/util.py | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/user_data/strategies/Strategy002.py b/user_data/strategies/Strategy002.py index 4f2c5fce7..754b2f964 100644 --- a/user_data/strategies/Strategy002.py +++ b/user_data/strategies/Strategy002.py @@ -171,7 +171,7 @@ class Strategy002(IStrategy): brain = "Freq_" + self.__class__.__name__ if Config.IS_BACKTEST: back_test(current_time, coin, brain) - else: + elif Config.IS_EXECUTION: execute(mode, coin, brain) return True diff --git a/user_data/strategies/Strategy003.py b/user_data/strategies/Strategy003.py index e0f179348..19c8aca66 100644 --- a/user_data/strategies/Strategy003.py +++ b/user_data/strategies/Strategy003.py @@ -186,6 +186,6 @@ class Strategy003(IStrategy): brain = "Freq_" + self.__class__.__name__ if Config.IS_BACKTEST: back_test(current_time, coin, brain) - else: + elif Config.IS_EXECUTION: execute(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 421bfce6b..270277bce 100644 --- a/user_data/strategies/Strategy004.py +++ b/user_data/strategies/Strategy004.py @@ -186,6 +186,6 @@ class Strategy004(IStrategy): brain = "Freq_" + self.__class__.__name__ if Config.IS_BACKTEST: back_test(current_time, coin, brain) - else: + elif Config.IS_EXECUTION: execute(mode, coin, brain) return True diff --git a/user_data/strategies/config.py b/user_data/strategies/config.py index d452cb844..1b928c9ae 100644 --- a/user_data/strategies/config.py +++ b/user_data/strategies/config.py @@ -4,6 +4,7 @@ class Config: BACKTEST_DATA_CLEANER_YEAR = 2020 BACKTEST_DATA_CLEANER_MONTH_INDEX = 9 IS_BACKTEST = False + IS_EXECUTION = True WORKSPACE_PATH = "workspace2" if IS_BACKTEST else "workspace" EXECUTION_PATH = "/root/" + WORKSPACE_PATH + "/execution/" - IS_PARALLER_EXECUTION = True + IS_PARALLEL_EXECUTION = True diff --git a/user_data/strategies/util.py b/user_data/strategies/util.py index 843876e61..a01ed4cb2 100644 --- a/user_data/strategies/util.py +++ b/user_data/strategies/util.py @@ -3,7 +3,7 @@ import threading from user_data.strategies.config import Config def execute(mode, coin, brain): - if Config.IS_PARALLER_EXECUTION: + if Config.IS_PARALLEL_EXECUTION: threading.Thread(target=_perform_execute, args=(mode, coin, brain)).start() else: _perform_execute(mode, coin, brain) @@ -17,7 +17,7 @@ def _perform_back_test(date_time, coin, brain): 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_PARALLER_EXECUTION: + if Config.IS_PARALLEL_EXECUTION: threading.Thread(target=_perform_back_test, args=(date_time, coin, brain)).start() else: _perform_back_test(date_time, coin, brain) \ No newline at end of file