Strategy parameters change is now working well!

Skinok · Skinok · commit f52b88b49c42 · 2021-11-29T19:55:08.000+01:00
diff --git a/Controller.py b/Controller.py
@@ -42,6 +42,9 @@ class Controller:
 
     def __init__(self):
 
+        # Init attributes
+        self.strategyParameters = {}
+
         # create a "Cerebro" engine instance
         self.cerebro = CerebroEnhanced()  
 
@@ -104,21 +107,44 @@ def addStrategy(self, strategyName):
         
         #For now, only one strategy is allowed at a time
         self.cerebro.clearStrategies()
+        
+        # Reset strategy parameters
+        self.strategyParameters = {}
 
         mod = __import__(strategyName, fromlist=[strategyName]) # first strategyName is the file name, and second (fromlist) is the class name
         self.strategyClass = getattr(mod, strategyName) # class name in the file
 
         # Add strategy parameters
-        self.interface.fillStrategyParameters(self.strategyClass.params)
+        self.interface.fillStrategyParameters(self.strategyClass)
+
+        pass
+
+    def strategyParametersChanged(self, lineEdit, parameterName, parameterOldValue):
+
+        # todo something
+        if len(lineEdit.text()) > 0:
 
-        # Add strategy to the cerebro
-        self.cerebro.addstrategy(self.strategyClass)
+            param = self.strategyClass.params._get(self.strategyClass.params,parameterName)
+
+            if isinstance(param, int):
+                self.strategyParameters[parameterName] = int(lineEdit.text())
+            elif isinstance(param, float):
+                self.strategyParameters[parameterName] = int(lineEdit.text())
+            else:
+                self.strategyParameters[parameterName] = lineEdit.text()
 
         pass
 
+    def strategyParametersSave(self, parameterName, parameterValue):
+        self.strategyParameters[parameterName] = parameterValue
+        pass
 
     def run(self):
 
+        # Add strategy here to get modified parameters
+        test = self.strategyParameters
+        self.strategyIndex = self.cerebro.addstrategy(self.strategyClass, test)
+
         # Wallet Management : reset between each run
         self.cerebro.broker.setcash(self.startingcash)
         self.wallet.reset(self.startingcash)
@@ -165,10 +191,8 @@ def displayStrategyResults(self):
         self.interface.displayPnL( pd.DataFrame(pnl_data) )
 
         pass
-
     
     def displayUI(self):
-        
         self.interface.show()
         pass
 
diff --git a/strategies/ichimokuStrat1.py b/strategies/ichimokuStrat1.py
@@ -41,8 +41,14 @@ def notify_order(self, order):
         if not order.alive():
             self.order = None  # indicate no order is pending
 
-    def __init__(self):
+    def __init__(self, parameters = None):
 
+        # Set UI modified parameters
+        if parameters != None:
+            for parameterName, parameterValue in parameters.items():
+                setattr(self.params, parameterName, parameterValue)
+
+        # Ichi indicator
         self.ichi = bt.indicators.Ichimoku(self.datas[0],
                                            tenkan=self.params.tenkan,
                                            kijun=self.params.kijun,
diff --git a/userInterface.py b/userInterface.py
@@ -544,18 +544,23 @@ def createTransactionsUI(self, trades):
 
         pass
     
-    def fillStrategyParameters(self, parameters):
+    def fillStrategyParameters(self, strategy):
 
         # Rest widget rows
         for indexRow in range(self.strategyTesterUI.parametersLayout.rowCount()):
             self.strategyTesterUI.parametersLayout.removeRow(0)
 
         # Insert parameters
         row = 0
-        for parameterName, parameterValue in parameters._getitems():
+        for parameterName, parameterValue in strategy.params._getitems():
             label = QtWidgets.QLabel(parameterName)
             lineEdit = QtWidgets.QLineEdit(str(parameterValue))
-            lineEdit.textChanged.connect(functools.partial(self.parameterChanged, lineEdit, parameters, parameterName, parameterValue))
+
+            # Save the parameter to inject it in the addStrategy method
+            self.controller.strategyParametersSave(parameterName, parameterValue)
+
+            # Connect the parameter changed slot
+            lineEdit.textChanged.connect(functools.partial(self.controller.strategyParametersChanged, lineEdit, parameterName, parameterValue))
 
             self.strategyTesterUI.parametersLayout.addRow(label, lineEdit )
             row = row + 1
@@ -564,18 +569,5 @@ def fillStrategyParameters(self, parameters):
         pass
 
 
-    def parameterChanged(self, lineEdit, parameters, parameterName, parameterOldValue):
-
-        # todo something
-        if len(lineEdit.text()) > 0:
-
-            try:
-                setattr(parameters,parameterName,float(lineEdit.text()))
-            except ValueError:
-                try:
-                    setattr(parameters,parameterName,int(lineEdit.text()))
-                except ValueError:
-                    setattr(parameters,parameterName,lineEdit.text())
-
-        pass
+    
     
