fix: value stored energy against s_initial, not the first step's SOC (#129)

Author: andig

src/optimizer/optimizer.py

@@ -989,10 +989,12 @@ def get_clean_objective_value(self):
         for t in self.time_steps:
             clean_objective += pulp.value(self.variables['e'][t]) * self.time_series.p_E[t]
 
-        # Final state of charge value [currency unit]
+        # Value of the energy the horizon added to the batteries [currency unit]. The reference is
+        # bat.s_initial and not s[0]: s[0] is the state after the first time step and already
+        # carries that step's charging, so subtracting it dropped the first step from the result.
         for i, bat in enumerate(self.batteries):
             clean_objective += (pulp.value(self.variables['s'][i][self.T-1])
-                                - pulp.value(self.variables['s'][i][0])) * bat.p_a
+                                - bat.s_initial) * bat.p_a
 
         # charge for import power demand rate. The demand rate is applied to the maximum
         # power draw beyond the threshold within the time horizon.

test_cases/009-discharge-before-import.json

@@ -448,7 +448,7 @@
       506.67163
     ],
     "limit_violations": {},
-    "objective_value": 2.6513393,
+    "objective_value": 2.66254976413256,
     "status": "Optimal"
   },
   "request": {

test_cases/010-infesible-charge-goal.json

@@ -412,7 +412,7 @@
       0
     ],
     "limit_violations": {},
-    "objective_value": 0.21802653,
+    "objective_value": 0.552987729936,
     "status": "Optimal"
   },
   "request": {

test_cases/011-infeasible-charge-demand.json

@@ -327,7 +327,7 @@
     },
     "expected_response": {
         "status": "Optimal",
-        "objective_value": 1.037952770013092,
+        "objective_value": 1.7419335994530019,
         "limit_violations": {
             "grid_import_limit_exceeded": false,
             "grid_export_limit_hit": false

test_cases/012-early-charging-not-perfect.json

@@ -412,7 +412,7 @@
       506.25586
     ],
     "limit_violations": {},
-    "objective_value": 1.5244173,
+    "objective_value": 1.56517752866355,
     "status": "Optimal"
   },
   "request": {

test_cases/013-grid-export-limit-hit.json

@@ -199,7 +199,7 @@
     },
     "expected_response": {
         "status": "Optimal",
-        "objective_value": 17.5372629588039,
+        "objective_value": 17.527010877312602,
         "limit_violations": {
             "grid_import_limit_exceeded": false,
             "grid_export_limit_hit": true

test_cases/014-grid-import-limit-violation.json

@@ -319,7 +319,7 @@
     "limit_violations": {
       "grid_import_limit_exceeded": true
     },
-    "objective_value": -7.0956674,
+    "objective_value": -7.094530917713852,
     "status": "Optimal"
   },
   "request": {

test_cases/015-low-soc-initial.json

@@ -363,7 +363,7 @@
     },
     "expected_response": {
         "status": "Optimal",
-        "objective_value": -6.4224528091250015,
+        "objective_value": -6.294173947715001,
         "limit_violations": {
             "grid_import_limit_exceeded": false,
             "grid_export_limit_hit": false

test_cases/016-battery-charge-priotization-1.json

@@ -448,7 +448,7 @@
       506.67163
     ],
     "limit_violations": {},
-    "objective_value": 2.6513393,
+    "objective_value": 2.66254976413256,
     "status": "Optimal"
   },
   "request": {

test_cases/017-battery-charge-priotization-2.json

@@ -381,7 +381,7 @@
       0
     ],
     "limit_violations": {},
-    "objective_value": 5.6556706,
+    "objective_value": 5.591261368,
     "status": "Optimal"
   },
   "request": {