make Strategy store roi and stoploss values as numbers to avoid later casting

This commit is contained in:
Janne Sinivirta
2018-02-11 15:02:42 +02:00
parent 5190cd507e
commit 2ce03ab1b5
5 changed files with 15 additions and 16 deletions

View File

@@ -255,7 +255,7 @@ def test_roi_table_generation():
'roi_p2': 2,
'roi_p3': 3,
}
assert generate_roi_table(params) == {'0': 6, '15': 3, '25': 1, '30': 0}
assert generate_roi_table(params) == {0: 6, 15: 3, 25: 1, 30: 0}
# test log_trials_result

View File

@@ -57,7 +57,7 @@ def test_strategy(result):
strategy.init({'strategy': 'default_strategy'})
assert hasattr(strategy.custom_strategy, 'minimal_roi')
assert strategy.minimal_roi['0'] == 0.04
assert strategy.minimal_roi[0] == 0.04
assert hasattr(strategy.custom_strategy, 'stoploss')
assert strategy.stoploss == -0.10
@@ -86,7 +86,7 @@ def test_strategy_override_minimal_roi(caplog):
strategy.init(config)
assert hasattr(strategy.custom_strategy, 'minimal_roi')
assert strategy.minimal_roi['0'] == 0.5
assert strategy.minimal_roi[0] == 0.5
assert ('freqtrade.strategy.strategy',
logging.INFO,
'Override strategy \'minimal_roi\' with value in config file.'
@@ -142,8 +142,8 @@ def test_strategy_singleton():
strategy1.init({'strategy': 'default_strategy'})
assert hasattr(strategy1.custom_strategy, 'minimal_roi')
assert strategy1.minimal_roi['0'] == 0.04
assert strategy1.minimal_roi[0] == 0.04
strategy2 = Strategy()
assert hasattr(strategy2.custom_strategy, 'minimal_roi')
assert strategy2.minimal_roi['0'] == 0.04
assert strategy2.minimal_roi[0] == 0.04