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

Changed table output to match hyperopt-list command

Browse Source
This commit is contained in:
Fredrik81 2020-02-29 23:24:08 +01:00
parent 349aa2f957
commit 23ae0653bd
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
freqtrade/optimize/hyperopt.py
View File

@ -276,10 +276,7 @@ class Hyperopt:
self.print_result_table(self.config, results, self.total_epochs, self.print_result_table(self.config, results, self.total_epochs,
self.print_all, self.print_colorized, self.print_all, self.print_colorized,
self.hyperopt_table_header) self.hyperopt_table_header)
if is_best:
self.hyperopt_table_header = 2 self.hyperopt_table_header = 2
else:
self.hyperopt_table_header = 3
@staticmethod @staticmethod
def print_results_explanation(results, total_epochs, highlight_best: bool, def print_results_explanation(results, total_epochs, highlight_best: bool,
@ -349,10 +346,17 @@ class Hyperopt:
str(trials.loc[i][z]), Style.RESET_ALL) str(trials.loc[i][z]), Style.RESET_ALL)
trials = trials.drop(columns=['is_initial_point', 'is_best', 'is_profit']) trials = trials.drop(columns=['is_initial_point', 'is_best', 'is_profit'])
if remove_header > 0:
table = tabulate(trials.to_dict(orient='list'), tablefmt='orgtbl',
headers='keys', stralign="right")
table = table.split("\n", remove_header)[remove_header]
elif remove_header < 0:
table = tabulate(trials.to_dict(orient='list'), tablefmt='psql',
headers='keys', stralign="right")
table = "\n".join(table.split("\n")[0:remove_header])
else:
table = tabulate(trials.to_dict(orient='list'), tablefmt='psql', table = tabulate(trials.to_dict(orient='list'), tablefmt='psql',
headers='keys', stralign="right") headers='keys', stralign="right")
if remove_header > 0:
table = table.split("\n", remove_header)[remove_header]
print(table) print(table)
def has_space(self, space: str) -> bool: def has_space(self, space: str) -> bool:
@ -541,7 +545,7 @@ class Hyperopt:
def start(self) -> None: def start(self) -> None:
self.random_state = self._set_random_state(self.config.get('hyperopt_random_state', None)) self.random_state = self._set_random_state(self.config.get('hyperopt_random_state', None))
logger.info(f"Using optimizer random state: {self.random_state}") logger.info(f"Using optimizer random state: {self.random_state}")
self.hyperopt_table_header = -1
data, timerange = self.backtesting.load_bt_data() data, timerange = self.backtesting.load_bt_data()
preprocessed = self.backtesting.strategy.tickerdata_to_dataframe(data) preprocessed = self.backtesting.strategy.tickerdata_to_dataframe(data)