From a73d5cd7e34b7e49dcb60c18f6664f583929aa1f Mon Sep 17 00:00:00 2001 From: Bemhreth Date: Wed, 26 Jan 2022 18:00:38 +0300 Subject: [PATCH] Implemented chages --- user_data/strategies/config.py | 4 ++-- user_data/strategies/freq_data_cleaner.py | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/user_data/strategies/config.py b/user_data/strategies/config.py index 5dd12eaac..02e864d91 100644 --- a/user_data/strategies/config.py +++ b/user_data/strategies/config.py @@ -1,7 +1,7 @@ class Config: BACKTEST_DOWNLOADED_JSON_DATA_FILE_PATH = "" - BACKTEST_YEAR = 2020 - BACKTEST_MONTH_INDEX = 9 + BACKTEST_DATA_CLEANER_YEAR = 2020 + BACKTEST_DATA_CLEANER_MONTH_INDEX = 9 IS_BACKTEST = False WORKSPACE_PATH = "workspace2" if IS_BACKTEST else "workspace" EXECUTION_PATH = "/root/" + WORKSPACE_PATH + "/execution/" diff --git a/user_data/strategies/freq_data_cleaner.py b/user_data/strategies/freq_data_cleaner.py index 08920f8e9..92d50b69e 100644 --- a/user_data/strategies/freq_data_cleaner.py +++ b/user_data/strategies/freq_data_cleaner.py @@ -4,6 +4,7 @@ import time import os import sys from config import Config + def clean_json(): print("clean_json: json_path = " + Config.BACKTEST_DOWNLOADED_JSON_DATA_FILE_PATH) file = open(Config.BACKTEST_DOWNLOADED_JSON_DATA_FILE_PATH) @@ -16,7 +17,7 @@ def clean_json(): date = datetime.datetime.strptime(str(date), "%Y-%m-%d %H:%M:%S") year = date.year month = date.month - if year == int(Config.BACKTEST_YEAR) and month == int(Config.BACKTEST_MONTH_INDEX): + if year == int(Config.BACKTEST_DATA_CLEANER_YEAR) and month == int(Config.BACKTEST_DATA_CLEANER_MONTH_INDEX): list.append(datas) json_object = json.dumps(list) file.close() @@ -28,12 +29,10 @@ def write_to_json(json_object): outfile.write(json_object) os.rename("temp.json", Config.BACKTEST_DOWNLOADED_JSON_DATA_FILE_PATH) -if len(sys.argv) < 4: +if len(sys.argv) < 2: exit("""Incorrect number of arguments. - python3 freq_data_cleaner.py [json_file] [month index] [year] + python3 freq_data_cleaner.py [json_file] """) else: Config.BACKTEST_DOWNLOADED_JSON_DATA_FILE_PATH = sys.argv[1] - Config.BACKTEST_MONTH_INDEX = sys.argv[2] - Config.BACKTEST_YEAR = sys.argv[3] clean_json() \ No newline at end of file