supplier

v2/architecture.py

@@ -106,7 +106,8 @@ class Decider:
     def decide(self, prod_pred, cons_pred, battery_model):
         # assert len(prod_pred) == len(cons_pred) == self.input_window_size
         self.random_seed += 1
-        self.random_seed %= 3 # dummy rotates between 3 Decisions
+        self.random_seed %= 3 # dummy rotates between Decisions
+        self.random_seed = Decision.PASSIVE
         return self.random_seed
         # dummy decider always says DISCHARGE:
         # return pd.Series([Decision.DISCHARGE] * self.output_window_size, dtype=int)
@@ -206,7 +207,6 @@ def simulator(battery_model, supplier, prod_cons, prod_predictor, cons_predictor
         else:
             consumption_from_network_to_bess = 0
 
-        supplier.(consumption_from_network)
         soc_series.append(battery_model.soc)
         consumption_from_solar_series.append(consumption_from_solar)
         consumption_from_network_series.append(consumption_from_network)
@@ -220,6 +220,11 @@ def simulator(battery_model, supplier, prod_cons, prod_predictor, cons_predictor
     consumption_from_bess_series = np.array(consumption_from_bess_series)
     discarded_production_series = np.array(discarded_production_series)
 
+    total_charge, consumption_charge_series, demand_charges = supplier.fee(
+        pd.Series(consumption_from_network_series, index=prod_cons.index),
+        provide_detail=True)
+    print(f"All in all we have paid {total_charge} to network.")
+
     results = pd.DataFrame({'soc_series': soc_series, 'consumption_from_solar': consumption_from_solar_series,
                             'consumption_from_network': consumption_from_network_series,
                             'consumption_from_bess': consumption_from_bess_series,

v2/supplier.py

@@ -55,7 +55,9 @@ class Supplier:
 
     # demand_series is pandas series indexed by time.
     # during each time step demand [kW] is assumed to be constant.
-    def fee(self, demand_series):
+    #
+    # TODO the provide_detail returned value types are inconsistent and confusing.
+    def fee(self, demand_series, provide_detail=False):
         prices = [self.price(date) for date in demand_series.index]
         prices_series = pd.Series(data=prices, index=demand_series.index)
         # prices are HUF/kWh, demand is kW. note the missing h.
@@ -71,7 +73,12 @@ class Supplier:
         fifteen_minute_peaks = demand_series.resample('15T').max()
         demand_charges = [self.demand_charge(demand) for demand in fifteen_minute_peaks]
         total_demand_charge = sum(demand_charges)
-        return consumption_charge + total_demand_charge
+        total_charge = consumption_charge + total_demand_charge
+        if provide_detail:
+            consumption_charge_series = demand_series * prices_series * step_in_hour
+            return total_charge, consumption_charge_series, demand_charges
+        else:
+            return total_charge
 
 
 class TestSupplier(unittest.TestCase):