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

rename ta_on_candle to process_only_new_candles

Browse Source 
be more expressive
This commit is contained in:
Matthias
2018-09-01 19:52:40 +02:00
parent cb46aeb73c
commit d35d3bb38c
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/constants.py
View File

@@ -53,7 +53,7 @@ CONF_SCHEMA = {
},
'fiat_display_currency': {'type': 'string', 'enum': SUPPORTED_FIAT},
'dry_run': {'type': 'boolean'},
'ta_on_candle': {'type': 'boolean'},
'process_only_new_candles': {'type': 'boolean'},
'minimal_roi': {
'type': 'object',
'patternProperties': {

6
freqtrade/strategy/interface.py
View File

@@ -71,7 +71,7 @@ class IStrategy(ABC):
ticker_interval: str
# run "populate_indicators" only for new candle
ta_on_candle: bool = False
process_only_new_candles: bool = False
# Dict to determine if analysis is necessary
_last_candle_seen_per_pair: Dict[str, datetime] = {}
@@ -124,8 +124,8 @@ class IStrategy(ABC):
pair = str(metadata.get('pair'))
# always run if ta_on_candle is set to true
if (not self.ta_on_candle or
# always run if process_only_new_candles is set to true
if (not self.process_only_new_candles or
self._last_candle_seen_per_pair.get(pair, None) != dataframe.iloc[-1]['date']):
# Defs that only make change on new candle data.
logging.debug("TA Analysis Launched")

10
freqtrade/strategy/resolver.py
View File

@@ -65,14 +65,14 @@ class StrategyResolver(object):
else:
config['ticker_interval'] = self.strategy.ticker_interval
if 'ta_on_candle' in config:
self.strategy.ta_on_candle = config['ta_on_candle']
if 'process_only_new_candles' in config:
self.strategy.process_only_new_candles = config['process_only_new_candles']
logger.info(
"Override ta_on_candle 'ta_on_candle' with value in config file: %s.",
config['ta_on_candle']
"Override process_only_new_candles 'process_only_new_candles' "
"with value in config file: %s.", config['process_only_new_candles']
)
else:
config['ta_on_candle'] = self.strategy.ta_on_candle
config['process_only_new_candles'] = self.strategy.process_only_new_candles
# Sort and apply type conversions
self.strategy.minimal_roi = OrderedDict(sorted(

6
freqtrade/tests/strategy/test_interface.py
View File

@@ -131,7 +131,7 @@ def test_analyze_ticker_default(ticker_history, mocker, caplog) -> None:
caplog.clear()
strategy.analyze_ticker(ticker_history, {'pair': 'ETH/BTC'})
# No analysis happens as ta_on_candle is true
# No analysis happens as process_only_new_candles is true
assert ind_mock.call_count == 2
assert buy_mock.call_count == 2
assert buy_mock.call_count == 2
@@ -153,7 +153,7 @@ def test_analyze_ticker_skip_analyze(ticker_history, mocker, caplog) -> None:
)
strategy = DefaultStrategy({})
strategy.ta_on_candle = True
strategy.process_only_new_candles = True
ret = strategy.analyze_ticker(ticker_history, {'pair': 'ETH/BTC'})
assert ind_mock.call_count == 1
@@ -165,7 +165,7 @@ def test_analyze_ticker_skip_analyze(ticker_history, mocker, caplog) -> None:
caplog.clear()
ret = strategy.analyze_ticker(ticker_history, {'pair': 'ETH/BTC'})
# No analysis happens as ta_on_candle is true
# No analysis happens as process_only_new_candles is true
assert ind_mock.call_count == 1
assert buy_mock.call_count == 1
assert buy_mock.call_count == 1

9
freqtrade/tests/strategy/test_strategy.py
View File

@@ -165,19 +165,20 @@ def test_strategy_override_ticker_interval(caplog):
) in caplog.record_tuples
def test_strategy_override_ta_on_candle(caplog):
def test_strategy_override_process_only_new_candles(caplog):
caplog.set_level(logging.INFO)
config = {
'strategy': 'DefaultStrategy',
'ta_on_candle': True
'process_only_new_candles': True
}
resolver = StrategyResolver(config)
assert resolver.strategy.ta_on_candle
assert resolver.strategy.process_only_new_candles
assert ('freqtrade.strategy.resolver',
logging.INFO,
"Override ta_on_candle 'ta_on_candle' with value in config file: True."
"Override process_only_new_candles 'process_only_new_candles' "
"with value in config file: True."
) in caplog.record_tuples