adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4 from Bovhasselt/Bo

Browse Source 
added custom support for CDL indicator automation hyperopting
This commit is contained in:
Bo van Hasselt 2021-02-28 00:34:30 +01:00 committed by GitHub
commit 56cfbe7065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
freqtrade/commands/automation_commands.py
View File

@ -157,8 +157,15 @@ def custom_hyperopt_buyelements(buy_indicators: List):
aim = indicator_info[1] aim = indicator_info[1]
usage = indicator_info[2] usage = indicator_info[2]
#If the indicator is a CDL indicator
if indicator[:3] == "CDL":
# add the triggers to its argument
for value in ["-100", "0", "100"]:
buy_triggers += f"if params['trigger'] == '{indicator + value}':\n conditions.append(dataframe['{indicator}'] == {value})\n"
# If the indicator is a guard # If the indicator is a guard
if usage == "guard": elif usage == "guard":
value = indicator_info[3] value = indicator_info[3]
if value >= -1.0 and value <= 1.0: if value >= -1.0 and value <= 1.0:
@ -191,7 +198,9 @@ def custom_hyperopt_buyelements(buy_indicators: List):
if usage == "trigger": if usage == "trigger":
buy_space += f"'{indicator}', " buy_space += f"'{indicator}', "
elif indicator[:3] == "CDL":
for value in [-100, 0, 100]:
buy_space += f"'{indicator + value}', "
# Deleting the last ", " # Deleting the last ", "
buy_space = buy_space[:-2] buy_space = buy_space[:-2]
buy_space += "], name='trigger')" buy_space += "], name='trigger')"
@ -212,6 +221,13 @@ def custom_hyperopt_sellelements(sell_indicators: Dict[str, str]):
aim = indicator_info[1] aim = indicator_info[1]
usage = indicator_info[2] usage = indicator_info[2]
#If the indicator is a CDL indicator
if indicator[:3] == "CDL":
# add the triggers to its argument
for value in ["-100", "0", "100"]:
sell_triggers += f"if params['sell-trigger'] == 'sell-{indicator + value}':\n conditions.append(dataframe['{indicator}'] == {value})\n"
# If the indicator is a guard # If the indicator is a guard
if usage == "guard": if usage == "guard":
value = indicator_info[3] value = indicator_info[3]
@ -247,6 +263,9 @@ def custom_hyperopt_sellelements(sell_indicators: Dict[str, str]):
if usage == "trigger": if usage == "trigger":
sell_space += f"'sell-{indicator}', " sell_space += f"'sell-{indicator}', "
elif indicator[:3] == "CDL":
for value in [-100, 0, 100]:
sell_space += f"'sell-{indicator + value}', "
# Deleting the last ", " # Deleting the last ", "
sell_space = sell_space[:-2] sell_space = sell_space[:-2]