Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor modular_microgrid to microgrid #150

Merged
merged 4 commits into from
Nov 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pymgrid/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion src/pymgrid/convert/convert.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 1 addition & 0 deletions src/pymgrid/microgrid/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
DEFAULT_HORIZON = 23

from .microgrid import Microgrid
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
1 change: 0 additions & 1 deletion src/pymgrid/modular_microgrid/__init__.py

This file was deleted.