Merge pull request #142 from Total-RD/ahalev_global_horizon

Add global default horizon
Total-RD · Nov 11, 2022 · 2a20204 · 2a20204
2 parents c7b0548 + 95e127e
commit 2a20204
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/src/pymgrid/microgrid/__init__.py b/src/pymgrid/microgrid/__init__.py
@@ -1 +1,3 @@
-from .modular_microgrid.modular_microgrid import Microgrid
+DEFAULT_HORIZON = 23
+
+from .modular_microgrid.modular_microgrid import Microgrid
diff --git a/src/pymgrid/microgrid/modular_microgrid/modular_microgrid.py b/src/pymgrid/microgrid/modular_microgrid/modular_microgrid.py
@@ -5,14 +5,13 @@
 from copy import deepcopy
 from warnings import warn
 
+from pymgrid.microgrid import DEFAULT_HORIZON
 from pymgrid.microgrid.modules import *
 from pymgrid.microgrid.modules.module_container import ModuleContainer
 from pymgrid.microgrid.utils.logger import ModularLogger
 from pymgrid.microgrid.utils.step import MicrogridStep
 from pymgrid.microgrid.utils.serialize import add_numpy_pandas_representers, add_numpy_pandas_constructors, dump_data
 
-DEFAULT_HORIZON = 23
-
 
 class Microgrid(yaml.YAMLObject):
     yaml_tag = u"!Microgrid"

diff --git a/src/pymgrid/microgrid/modules/base/timeseries/base_timeseries_module.py b/src/pymgrid/microgrid/modules/base/timeseries/base_timeseries_module.py
@@ -1,6 +1,7 @@
 from abc import ABC, abstractmethod
 
 import numpy as np
+from pymgrid.microgrid import DEFAULT_HORIZON
 from pymgrid.microgrid.modules.base import BaseMicrogridModule
 from pymgrid.microgrid.modules.base.timeseries.forecaster import get_forecaster
 
@@ -10,7 +11,7 @@ def __init__(self,
                  time_series,
                  raise_errors,
                  forecaster=None,
-                 forecast_horizon=24,
+                 forecast_horizon=DEFAULT_HORIZON,
                  forecaster_increase_uncertainty=False,
                  provided_energy_name='provided_energy',
                  absorbed_energy_name='absorbed_energy',

diff --git a/src/pymgrid/microgrid/modules/grid_module.py b/src/pymgrid/microgrid/modules/grid_module.py
@@ -1,6 +1,7 @@
 import numpy as np
 import yaml
 
+from pymgrid.microgrid import DEFAULT_HORIZON
 from pymgrid.microgrid.modules.base import BaseTimeSeriesMicrogridModule
 
 
@@ -55,7 +56,7 @@ def __init__(self,
                  max_export,
                  time_series,
                  forecaster=None,
-                 forecast_horizon=24,
+                 forecast_horizon=DEFAULT_HORIZON,
                  forecaster_increase_uncertainty=False,
                  cost_per_unit_co2=0.0,
                  raise_errors=False):

diff --git a/src/pymgrid/microgrid/modules/load_module.py b/src/pymgrid/microgrid/modules/load_module.py
@@ -1,6 +1,7 @@
 import numpy as np
 import yaml
 
+from pymgrid.microgrid import DEFAULT_HORIZON
 from pymgrid.microgrid.modules.base import BaseTimeSeriesMicrogridModule
 
 
@@ -13,7 +14,7 @@ class LoadModule(BaseTimeSeriesMicrogridModule):
     def __init__(self, time_series,
                  loss_load_cost,
                  forecaster=None,
-                 forecast_horizon=24,
+                 forecast_horizon=DEFAULT_HORIZON,
                  forecaster_increase_uncertainty=False,
                  raise_errors=False):
         super().__init__(time_series,

diff --git a/src/pymgrid/microgrid/modules/renewable_module.py b/src/pymgrid/microgrid/modules/renewable_module.py
@@ -1,6 +1,7 @@
 import numpy as np
 import yaml
 
+from pymgrid.microgrid import DEFAULT_HORIZON
 from pymgrid.microgrid.modules.base import BaseTimeSeriesMicrogridModule
 
 
@@ -13,7 +14,7 @@ class RenewableModule(BaseTimeSeriesMicrogridModule):
     def __init__(self, time_series,
                  raise_errors=False,
                  forecaster=None,
-                 forecast_horizon=24,
+                 forecast_horizon=DEFAULT_HORIZON,
                  forecaster_increase_uncertainty=False,
                  provided_energy_name='renewable_used'):
         super().__init__(time_series,