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

Changed table formating. Adding some code to align hyperopt table generation. WIP

This commit is contained in:
Fredrik81 2020-03-03 01:14:56 +01:00
parent 379275e2d6
commit 399c419163
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
freqtrade/optimize/hyperopt.py
View File

@ -325,15 +325,20 @@ class Hyperopt:
trials['Trades'] = trials['Trades'].astype(str)
trials['Epoch'] = trials['Epoch'].apply(
lambda x: "{}/{}".format(x, total_epochs))
lambda x: '{}/{}'.format(str(x).rjust(len(str(total_epochs)), ' '), total_epochs))
trials['Avg profit'] = trials['Avg profit'].apply(
lambda x: '{:,.2f}%'.format(x) if not isna(x) else x)
lambda x: ('{:,.2f}%'.format(x)).rjust(7, ' ') if not isna(x) else "--".rjust(7, ' '))
trials['Profit'] = trials['Profit'].apply(
lambda x: '{:,.2f}%'.format(x) if not isna(x) else x)
lambda x: ('{:,.2f}%'.format(x)) if not isna(x) else "--")
trials['Total profit'] = trials['Total profit'].apply(
lambda x: '{:,.8f} '.format(x) + config['stake_currency'] if not isna(x) else x)
lambda x: ('{:,.8f} '.format(x)) + config['stake_currency'] if not isna(x) else "--")
trials['Avg duration'] = trials['Avg duration'].apply(
lambda x: '{:,.1f}m'.format(x) if not isna(x) else x)
lambda x: ('{:,.1f}m'.format(x)).rjust(7, ' ') if not isna(x) else "--".rjust(7, ' '))
trials['Objective'] = trials['Objective'].apply(
lambda x: str(x).rjust(10, ' ') if str(x) != str(100000) else "N/A".rjust(10, ' '))
trials['Profit'] = trials['Total profit'] + " (" + trials['Profit'] + ")"
trials = trials.drop(columns=['Total profit'])
if print_colorized:
for i in range(len(trials)):
if trials.loc[i]['is_profit']:

4
tests/optimize/test_hyperopt.py
View File

@ -413,7 +413,9 @@ def test_log_results_if_loss_improves(hyperopt, capsys) -> None:
'| Best | 2/2 | 1 | 0.10% | 0.00100000 BTC |'
' 1.00% | 20.0m | 1 |'
)
assert result_str in out
# assert result_str in out
assert all(x in out
for x in ["Best", "2/2", " 1", "0.10%", "0.00100000 BTC", "1.00%", "20.0m"])
def test_no_log_if_loss_does_not_improve(hyperopt, caplog) -> None: