Fix : Wallet cash

Skinok · Skinok · commit 2b12c7db3c0b · 2021-11-25T21:10:39.000+01:00
diff --git a/Controller.py b/Controller.py
@@ -51,9 +51,12 @@ def __init__(self):
         self.interface = interface
 
         # Strategie testing wallet (a little bit different from backtrader broker class)
+        self.startingcash = 10000.0
+
         global wallet
-        wallet = Wallet()
+        wallet = Wallet(self.startingcash)
         self.wallet = wallet
+        
 
         # Then add obersers and analyzers
         self.cerebro.addanalyzer(bt.analyzers.TradeAnalyzer, _name = "ta")
@@ -114,6 +117,10 @@ def addStrategy(self, strategyName):
 
     def run(self):
 
+        # Wallet Management : reset between each run
+        self.cerebro.broker.setcash(self.startingcash)
+        self.wallet.reset(self.startingcash)
+
         # Compute strategy results
         results = self.cerebro.run()  # run it all
         self.strat_results = results[0] # results of the first strategy
@@ -142,7 +149,6 @@ def displayStrategyResults(self):
             if order.status in [order.Completed]:
                 self.myOrders.append(order)
 
-
         self.interface.setOrders(self.myOrders)
 
         # Profit and Loss
@@ -165,7 +171,10 @@ def displayUI(self):
         pass
 
     
-    def cashChanged(self, cash):
-        if len(cash) > 0:
-            self.cerebro.broker.setcash(float(cash))
+    def cashChanged(self, cashString):
+
+        if len(cashString) > 0:
+            self.startingcash = float(cashString)
+            self.cerebro.broker.setcash(self.startingcash)
+
         pass
diff --git a/finplotWindow.py b/finplotWindow.py
@@ -341,11 +341,11 @@ def show(self):
 
     def drawPnL(self, pln_data):
 
-        # put an MA on the close price
-        #fplt.plot(pln_data['time'], pln_data['pnlcomm'], ax = self.axPnL)
-        #fplt.plot(pln_data['time'], pln_data['cash'], ax = self.axPnL, legend="Cash")
+        self.axPnL.reset()
+
         fplt.plot(pln_data['time'], pln_data['value'], ax = self.axPnL, legend="value")
         fplt.plot(pln_data['time'], pln_data['equity'], ax = self.axPnL, legend="equity")
+        
         self.axPnL.ax_widget.show()
         self.axPnL.show()
 
diff --git a/observers/SkinokObserver.py b/observers/SkinokObserver.py
@@ -36,9 +36,6 @@ def __init__(self):
         self.progressBar.setMaximum(self.datas[0].close.buflen())
         self.progressBar.setValue(0)
 
-        # Wallet Management
-        Controller.wallet.reset()
-
     def next(self):
 
         # Watch trades
diff --git a/wallet.py b/wallet.py
@@ -20,17 +20,17 @@
 ###############################################################################
 class Wallet():
 
-    def __init__(self):
+    def __init__(self, startingCash):
 
-        self.reset()
+        self.reset(startingCash)
 
         pass
 
-    def reset(self):
+    def reset(self, startingCash):
 
-        self.current_value = 10000 # todo: change it by initial cash settings
-        self.current_cash = 10000 # todo: change it by initial cash settings
-        self.current_equity = 10000 # todo: change it by initial cash settings
+        self.current_value = startingCash # todo: change it by initial cash settings
+        self.current_cash = startingCash # todo: change it by initial cash settings
+        self.current_equity = startingCash # todo: change it by initial cash settings
 
         self.value_list = []
         self.cash_list = []
