pull up compute_net_load method

Author: ahalev

src/pymgrid/envs/base/base.py

@@ -292,48 +292,6 @@ def render(self, mode="human"):
     def sample_action(self, strict_bound=False, sample_flex_modules=False):
         return self.action_space.sample()
 
-    def compute_net_load(self, normalized=False):
-        """
-        Compute the net load at the current step.
-
-        Net load is load minus renewables.
-        -------
-
-        Returns
-        -------
-        net_load : float
-            Net load.
-
-        """
-
-        try:
-            fixed_consumption = self.modules.fixed.get_attrs('max_consumption', as_pandas=False, drop_attr_names=True)
-            fixed_consumption = np.sum(list(fixed_consumption.values()))
-        except AttributeError:
-            fixed_consumption = 0.0
-        except IndexError:
-            # Exhausted available data. Episode should be over
-            assert self.current_step == self.final_step
-            return 0.0
-
-        try:
-            flex_max_prod = [m.max_production for m in self.modules.flex.iterlist() if m.marginal_cost == 0]
-        except IndexError:
-            # Exhausted available data. Episode should be over
-            assert self.current_step == self.final_step
-            return 0.0
-
-        flex_production = sum(flex_max_prod)
-
-        net_load = fixed_consumption - flex_production
-
-        if normalized:
-            if fixed_consumption:
-                return net_load / fixed_consumption
-            return -1.0
-
-        return net_load
-
     def state_dict(self, normalized=False, as_run_output=False, _initial=None):
         net_load = self.compute_net_load(normalized=normalized)
 

src/pymgrid/microgrid/microgrid.py

@@ -600,6 +600,49 @@ def set_forecaster(self,
                 except AttributeError:
                     pass
 
+    def compute_net_load(self, normalized=False):
+        """
+        Compute the net load at the current step.
+
+        Net load is load minus renewables.
+        -------
+
+        Returns
+        -------
+        net_load : float
+            Net load.
+
+        """
+
+        try:
+            fixed_consumption = self.modules.fixed.get_attrs('max_consumption', as_pandas=False, drop_attr_names=True)
+            fixed_consumption = np.sum(list(fixed_consumption.values()))
+        except AttributeError:
+            fixed_consumption = 0.0
+        except IndexError:
+            # Exhausted available data. Episode should be over
+            assert self.current_step == self.final_step
+            return 0.0
+
+        try:
+            flex_max_prod = [m.max_production for m in self.modules.flex.iterlist() if m.marginal_cost == 0]
+        except IndexError:
+            # Exhausted available data. Episode should be over
+            assert self.current_step == self.final_step
+            return 0.0
+
+        flex_production = sum(flex_max_prod)
+
+        net_load = fixed_consumption - flex_production
+
+        if normalized:
+            if fixed_consumption:
+                return net_load / fixed_consumption
+            return -1.0
+
+        return net_load
+
+
     def get_forecast_horizon(self):
         """
         Get the forecast horizon of timeseries modules contained in the microgrid.