CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2025-12-03 10:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use candle_type_def where possible

Browse Source
This commit is contained in:
Matthias
2021-12-08 14:10:08 +01:00
parent 222c293602
commit d89cbda7b8
9 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
freqtrade/strategy/interface.py
View File

@@ -424,7 +424,8 @@ class IStrategy(ABC, HyperStrategyMixin):
informative_pairs = self.informative_pairs()
# Compatibility code for 2 tuple informative pairs
informative_pairs = [
(p[0], p[1], CandleType.from_string(p[2]) if len(p) > 2 else CandleType.SPOT_)
(p[0], p[1], CandleType.from_string(p[2]) if len(
p) > 2 else self.config['candle_type_def'])
for p in informative_pairs]
for inf_data, _ in self._ft_informative:
if inf_data.asset:
@@ -530,8 +531,9 @@ class IStrategy(ABC, HyperStrategyMixin):
dataframe = self.analyze_ticker(dataframe, metadata)
self._last_candle_seen_per_pair[pair] = dataframe.iloc[-1]['date']
if self.dp:
self.dp._set_cached_df(pair, self.timeframe, dataframe, CandleType.SPOT_)
# TODO-lev: CandleType should be set conditionally
self.dp._set_cached_df(
pair, self.timeframe, dataframe,
candle_type=self.config['candle_type_def'])
else:
logger.debug("Skipping TA Analysis for already analyzed candle")
dataframe[SignalType.ENTER_LONG.value] = 0