Merge pull request #135 from onIon-energy/michaelpiron-patch-1

Update optimization.py
davidusb-geek · Dec 15, 2023 · 4aa01ad · 4aa01ad
2 parents bec6f76 + d77c4f6
commit 4aa01ad
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/emhass/optimization.py b/src/emhass/optimization.py
@@ -204,10 +204,10 @@ def perform_optimization(self, data_opt: pd.DataFrame, P_PV: np.array, P_load: n
                                       for i in set_I)
         elif self.costfun == 'cost':
             if self.optim_conf['set_total_pv_sell']:
-                objective = plp.lpSum(-0.001*self.timeStep*unit_load_cost[i]*P_grid_pos[i]
+                objective = plp.lpSum(-0.001*self.timeStep*unit_load_cost[i]*(P_load[i] + P_def_sum[i])
                                       for i in set_I)
             else:
-                objective = plp.lpSum(-0.001*self.timeStep*unit_load_cost[i]*(P_load[i] + P_def_sum[i])
+                objective = plp.lpSum(-0.001*self.timeStep*unit_load_cost[i]*P_grid_pos[i]
                                       for i in set_I)
         elif self.costfun == 'self-consumption':
             if type_self_conso == 'bigm':
@@ -450,7 +450,10 @@ def perform_optimization(self, data_opt: pd.DataFrame, P_PV: np.array, P_load: n
                 opt_tp["cost_fun_profit"] = [-0.001*self.timeStep*(unit_load_cost[i]*P_grid_pos[i].varValue + \
                     unit_prod_price[i]*P_grid_neg[i].varValue) for i in set_I]
         elif self.costfun == 'cost':
-            opt_tp["cost_fun_cost"] = [-0.001*self.timeStep*unit_load_cost[i]*(P_load[i] + P_def_sum_tp[i]) for i in set_I]
+            if self.optim_conf['set_total_pv_sell']:
+                opt_tp["cost_fun_cost"] = [-0.001*self.timeStep*unit_load_cost[i]*(P_load[i] + P_def_sum_tp[i]) for i in set_I]
+            else:
+                opt_tp["cost_fun_cost"] = [-0.001*self.timeStep*unit_load_cost[i]*P_grid_pos[i].varValue for i in set_I]
         elif self.costfun == 'self-consumption':
             if type_self_conso == 'maxmin':
                 opt_tp["cost_fun_selfcons"] = [-0.001*self.timeStep*unit_load_cost[i]*SC[i].varValue for i in set_I]