From c4e43039f20accf285d201bd6e93177d768697d1 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Thu, 9 Aug 2018 19:24:00 +0200
Subject: [PATCH] Allow control from strategy

---
 freqtrade/strategy/interface.py       | 6 +++++-
 freqtrade/strategy/resolver.py        | 9 +++++++++
 user_data/strategies/test_strategy.py | 3 +++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py
index 0f03cddb3..494f65547 100644
--- a/freqtrade/strategy/interface.py
+++ b/freqtrade/strategy/interface.py
@@ -70,6 +70,9 @@ class IStrategy(ABC):
     # associated ticker interval
     ticker_interval: str
 
+    # run "populate_indicators" only for new candle
+    ta_on_candle: bool = False
+
     # Dict to determine if analysis is necessary
     candle_seen: Dict[str, datetime] = {}
 
@@ -121,7 +124,8 @@ class IStrategy(ABC):
 
         pair = str(metadata.get('pair'))
 
-        if (not self.config.get('ta_on_candle') or
+        # always run if ta_on_candle is set to true
+        if (not self.ta_on_candle or
                 self.candle_seen.get(pair, None) != dataframe.iloc[-1]['date']):
             # Defs that only make change on new candle data.
             logging.debug("TA Analysis Launched")
diff --git a/freqtrade/strategy/resolver.py b/freqtrade/strategy/resolver.py
index 7aeec300e..1a15ba63f 100644
--- a/freqtrade/strategy/resolver.py
+++ b/freqtrade/strategy/resolver.py
@@ -65,6 +65,15 @@ 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']
+            logger.info(
+                "Override ta_on_candle \'ta_on_candle\' with value in config file: %s.",
+                config['ta_on_candle']
+            )
+        else:
+            config['ta_on_candle'] = self.strategy.ta_on_candle
+
         # Sort and apply type conversions
         self.strategy.minimal_roi = OrderedDict(sorted(
             {int(key): value for (key, value) in self.strategy.minimal_roi.items()}.items(),
diff --git a/user_data/strategies/test_strategy.py b/user_data/strategies/test_strategy.py
index 80c238d92..7c3892b77 100644
--- a/user_data/strategies/test_strategy.py
+++ b/user_data/strategies/test_strategy.py
@@ -45,6 +45,9 @@ class TestStrategy(IStrategy):
     # Optimal ticker interval for the strategy
     ticker_interval = '5m'
 
+    # run "populate_indicators" only for new candle
+    ta_on_candle = False
+
     def populate_indicators(self, dataframe: DataFrame, metadata: dict) -> DataFrame:
         """
         Adds several different TA indicators to the given DataFrame