Strategy change, trigeer a good list of parameters

Skinok · Skinok · commit f8a8b684c36e · 2021-11-24T20:20:29.000+01:00
diff --git a/Controller.py b/Controller.py
@@ -78,6 +78,8 @@ def __init__(self):
         # Once everything is created, initialize data
         self.interface.initialize()
 
+
+
         pass
 
     def loadData(self, dataPath):
diff --git a/strategies/sma_crossover.py b/strategies/sma_crossover.py
@@ -52,11 +52,13 @@ class sma_crossover(bt.Strategy):
 
     params = (
         # period for the fast Moving Average
-        ('fast', 10),
+        ('fast', 15),
         # period for the slow moving average
         ('slow', 30),
         # moving average to use
-        ('_movav', btind.MovAv.SMA)
+        ('_movav', btind.MovAv.SMA),
+        # Trade size
+        ('tradeSize', 2000)
     )
 
     def __init__(self):
@@ -68,7 +70,7 @@ def __init__(self):
     def next(self):
         if self.position.size:
             if self.buysig < 0:
-                self.sell(size=1000)
+                self.sell(size=self.p.tradeSize)
 
         elif self.buysig > 0:
-            self.buy(size=1000)
+            self.buy(size=self.p.tradeSize)
diff --git a/ui/strategyTester.ui b/ui/strategyTester.ui
@@ -31,7 +31,7 @@
            <x>0</x>
            <y>0</y>
            <width>188</width>
-           <height>205</height>
+           <height>219</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout">
@@ -129,16 +129,6 @@
         <property name="spacing">
          <number>9</number>
         </property>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_2">
-          <property name="text">
-           <string>Tradse size</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QLineEdit" name="lineEdit_3"/>
-        </item>
         <item row="0" column="0">
          <widget class="QLabel" name="label">
           <property name="text">
@@ -147,7 +137,7 @@
          </widget>
         </item>
         <item row="0" column="1">
-         <widget class="QLineEdit" name="lineEdit">
+         <widget class="QLineEdit" name="startingCashLE">
           <property name="inputMask">
            <string/>
           </property>
diff --git a/userInterface.py b/userInterface.py
@@ -303,6 +303,10 @@ def createStrategyTesterUI(self):
         self.strategyResultsUI = strategyResultsUI.StrategyResultsUI(self.controller)
         self.dock_strategyResultsUI.addWidget(self.strategyResultsUI)
 
+        #
+        self.strategyTesterUI.startingCashLE.setText(str(self.controller.cerebro.broker.cash))
+        # self.interface.tradesSizeLE.setValue(self.cerebro.broker.cash)
+
         pass
 
     #########
@@ -533,7 +537,7 @@ def fillStrategyParameters(self, items):
 
         # Rest widget rows
         for indexRow in range(self.strategyTesterUI.parametersLayout.rowCount()):
-            self.strategyTesterUI.parametersLayout.removeRow(indexRow)
+            self.strategyTesterUI.parametersLayout.removeRow(0)
 
         # Insert parameters
         row = 0
@@ -544,4 +548,6 @@ def fillStrategyParameters(self, items):
             row = row + 1
             pass
 
-        pass
+        pass
+
+    
