Skip to content
This repository has been archived by the owner on Jun 8, 2023. It is now read-only.

🐞 BugFix - New timeframes config section #165

Merged
merged 1 commit into from
Oct 17, 2021
Merged

🐞 BugFix - New timeframes config section #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions user_data/mgm_tools/ExportCsvResults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ def ExportCsvResults(config_file, input_file, output_file):
# results_df['balance_max'] = epochs['results_metrics.csum_max'].apply(lambda x: round(x,2))
results_df['pairlist'] = epochs['results_metrics.pairlist']
results_df['max_open_trades_setting'] = epochs['results_metrics.max_open_trades_setting']
results_df['timeframe'] = mgm_config['timeframe']
results_df['backtest_timeframe'] = mgm_config['backtest_timeframe']
results_df['timeframe'] = mgm_config['timeframes']['timeframe']
results_df['backtest_timeframe'] = mgm_config['timeframes']['backtest_timeframe']
results_df['timerange'] = epochs['results_metrics.timerange']
results_df['backtest_start'] = epochs['results_metrics.backtest_start']
results_df['backtest_end'] = epochs['results_metrics.backtest_end']
Expand Down
2 changes: 1 addition & 1 deletion user_data/mgm_tools/mgm_hurry/MoniGoManiCli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ def calculate_timerange_start_minus_startup_candle_count(self, timerange: int =
# Calculate the amount of days to add to the timerange based on the startup candle count & candle size
mgm_config_files = self.monigomani_config.load_config_files()
timeframe_minutes = self.timeframe_to_minutes(
mgm_config_files['mgm-config']['monigomani_settings']['timeframe'])
mgm_config_files['mgm-config']['monigomani_settings']['timeframes']['timeframe'])
startup_candle_count = mgm_config_files['mgm-config']['monigomani_settings']['startup_candle_count']
extra_days = ceil((timeframe_minutes * startup_candle_count) / (60 * 24))

Expand Down
6 changes: 3 additions & 3 deletions user_data/strategies/MasterMoniGoManiHyperStrategy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ class MasterMoniGoManiHyperStrategy(IStrategy, ABC):

# Apply the loaded MoniGoMani Settings
try:
backtest_timeframe = mgm_config["timeframes"]['backtest_timeframe']
core_trend_timeframe_multiplier = mgm_config["timeframes"]['core_trend_timeframe_multiplier']
timeframe = mgm_config["timeframes"]['timeframe']
backtest_timeframe = mgm_config['timeframes']['backtest_timeframe']
core_trend_timeframe_multiplier = mgm_config['timeframes']['core_trend_timeframe_multiplier']
timeframe = mgm_config['timeframes']['timeframe']
startup_candle_count = mgm_config['startup_candle_count']
precision = mgm_config['precision']
min_weighted_signal_value = mgm_config['weighted_signal_spaces']['min_weighted_signal_value']
Expand Down