From 95e127e5e065816767f7c5cefc064d95c7f8fe5c Mon Sep 17 00:00:00 2001 From: ahalev Date: Thu, 10 Nov 2022 23:57:59 -0800 Subject: [PATCH] add global default horizon --- src/pymgrid/microgrid/__init__.py | 4 +++- src/pymgrid/microgrid/modular_microgrid/modular_microgrid.py | 3 +-- .../modules/base/timeseries/base_timeseries_module.py | 3 ++- src/pymgrid/microgrid/modules/grid_module.py | 3 ++- src/pymgrid/microgrid/modules/load_module.py | 3 ++- src/pymgrid/microgrid/modules/renewable_module.py | 3 ++- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/pymgrid/microgrid/__init__.py b/src/pymgrid/microgrid/__init__.py index 4a1c9c33..f0dd5af4 100644 --- a/src/pymgrid/microgrid/__init__.py +++ b/src/pymgrid/microgrid/__init__.py @@ -1 +1,3 @@ -from .modular_microgrid.modular_microgrid import Microgrid \ No newline at end of file +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 index a2cdbe36..a6f14098 100644 --- 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 index c9a13ef4..dd73637b 100644 --- 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 index 2da0b82a..ea2697b2 100644 --- 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 index be8e1782..c08d98f3 100644 --- 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 index a6bbb53a..8fb39dd0 100644 --- 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,