Merge pull request #150 from Total-RD/ahalev_refactor_v2

refactor modular_microgrid to microgrid
Total-RD · Nov 23, 2022 · f148f85 · f148f85
2 parents f2e05ca + 3f0040e
commit f148f85
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 4 deletions.
diff --git a/src/pymgrid/__init__.py b/src/pymgrid/__init__.py
@@ -5,6 +5,6 @@
 PROJECT_PATH = Path(__file__).parent
 
 from ._deprecated.non_modular_microgrid import NonModularMicrogrid
-from .modular_microgrid import Microgrid
+from .microgrid import Microgrid
 from .MicrogridGenerator import MicrogridGenerator
 
diff --git a/src/pymgrid/convert/convert.py b/src/pymgrid/convert/convert.py
@@ -1,5 +1,5 @@
 from pymgrid._deprecated.non_modular_microgrid import NonModularMicrogrid
-from pymgrid.modular_microgrid.modular_microgrid import Microgrid
+from pymgrid.microgrid.microgrid import Microgrid
 from pymgrid.convert.get_module import get_module
 from pymgrid.convert.to_nonmodular_ops import check_viability, add_params_from_module, get_empty_params, finalize_params
 

diff --git a/src/pymgrid/microgrid/__init__.py b/src/pymgrid/microgrid/__init__.py
@@ -1,2 +1,3 @@
 DEFAULT_HORIZON = 23
 
+from .microgrid import Microgrid
diff --git a/...id/modular_microgrid/modular_microgrid.py → src/pymgrid/microgrid/microgrid.py b/...id/modular_microgrid/modular_microgrid.py → src/pymgrid/microgrid/microgrid.py
@@ -8,7 +8,7 @@
 from pymgrid.microgrid import DEFAULT_HORIZON
 from pymgrid.modules import ModuleContainer, UnbalancedEnergyModule
 from pymgrid.utils.logger import ModularLogger
-from pymgrid.modular_microgrid.utils.step import MicrogridStep
+from pymgrid.microgrid.utils.step import MicrogridStep
 from pymgrid.utils.serialize import add_numpy_pandas_representers, add_numpy_pandas_constructors, dump_data
 
 

diff --git a/...mgrid/modular_microgrid/utils/__init__.py → src/pymgrid/microgrid/utils/__init__.py b/...mgrid/modular_microgrid/utils/__init__.py → src/pymgrid/microgrid/utils/__init__.py
diff --git a/src/pymgrid/modular_microgrid/utils/step.py → src/pymgrid/microgrid/utils/step.py b/src/pymgrid/modular_microgrid/utils/step.py → src/pymgrid/microgrid/utils/step.py
diff --git a/src/pymgrid/modular_microgrid/__init__.py b/src/pymgrid/modular_microgrid/__init__.py
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,3 @@
		DEFAULT_HORIZON = 23

		from .microgrid import Microgrid