From 04d5e857e2e9bc49d66055c1ec25088c45265e59 Mon Sep 17 00:00:00 2001
From: Gert <berlinguyinca@gmail.com>
Date: Tue, 31 Jul 2018 18:10:23 -0700
Subject: [PATCH] added option to easily switch between backtesting and
 backslapping from the commandline option

---
 freqtrade/arguments.py            |  8 ++++++++
 freqtrade/optimize/backtesting.py | 12 +++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/freqtrade/arguments.py b/freqtrade/arguments.py
index 022a2c739..1f6de2052 100644
--- a/freqtrade/arguments.py
+++ b/freqtrade/arguments.py
@@ -161,6 +161,14 @@ class Arguments(object):
             dest='exportfilename',
             metavar='PATH',
         )
+        parser.add_argument(
+            '--backslap',
+            help="Utilize the Backslapping approach instead of the default Backtesting. This should provide more "
+                 "accurate results, unless you are utilizing Min/Max function in your strategy.",
+            required=False,
+            dest='backslap',
+            action='store_true'
+        )
 
     @staticmethod
     def optimizer_shared_options(parser: argparse.ArgumentParser) -> None:
diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py
index 688b760ca..6ba6d7e3e 100644
--- a/freqtrade/optimize/backtesting.py
+++ b/freqtrade/optimize/backtesting.py
@@ -98,7 +98,13 @@ class Backtesting(object):
         # self.np_sto: int = self.np_close  # stops_triggered_on - Should be low, FT uses close
         # self.np_sco: int = self.np_close  # stops_calculated_on - Should be stop, FT uses close
 
-        self.use_backslap = True  # Enable backslap - if false Orginal code is executed.
+        if 'backslap' in config:
+            self.use_backslap = config['backslap']  # Enable backslap - if false Orginal code is executed.
+        else:
+            self.use_backslap = False
+
+        logger.info("using backslap: {}".format(self.use_backslap))
+
         self.debug = False  # Main debug enable, very print heavy, enable 2 loops recommended
         self.debug_timing = False  # Stages within Backslap
         self.debug_2loops = False  # Limit each pair to two loops, useful when debugging
@@ -364,7 +370,6 @@ class Backtesting(object):
             timerange = Arguments.parse_timerange(None if self.config.get(
                 'timerange') is None else str(self.config.get('timerange')))
 
-            ld_files = self.s()
             data = optimize.load_data(
                 self.config['datadir'],
                 pairs=pairs,
@@ -374,6 +379,7 @@ class Backtesting(object):
                 timerange=timerange
             )
 
+        ld_files = self.s()
         if not data:
             logger.critical("No data found. Terminating.")
             return
@@ -489,7 +495,7 @@ def setup_configuration(args: Namespace) -> Dict[str, Any]:
     # Ensure we do not use Exchange credentials
     config['exchange']['key'] = ''
     config['exchange']['secret'] = ''
-
+    config['backslap'] = args.backslap
     if config['stake_amount'] == constants.UNLIMITED_STAKE_AMOUNT:
         raise DependencyException('stake amount could not be "%s" for backtesting' %
                                   constants.UNLIMITED_STAKE_AMOUNT)