Skip to content
Open
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
from flexmeasures_s2.profile_steering.device_planner.nocontrol.s2_nocontrol_device_state import (
S2NoControlDeviceState,
)
from flexmeasures_s2.profile_steering.device_planner.nocontrol.s2_nocontrol_device_planner import (
S2NoControlDevicePlanner,
)
from flexmeasures_s2.profile_steering.device_planner.nocontrol.s2_nocontrol_plan import (
S2NoControlPlan,
)
from flexmeasures_s2.profile_steering.device_planner.nocontrol.proposal_without_improvement import (
ProposalWithoutImprovement,
)

__all__ = [
"S2NoControlDeviceState",
"S2NoControlDevicePlanner",
"S2NoControlPlan",
"ProposalWithoutImprovement",
]
15 changes: 15 additions & 0 deletions flexmeasures_s2/profile_steering/planning_service_impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@
from flexmeasures_s2.profile_steering.device_planner.frbc.s2_frbc_device_state import (
S2FrbcDeviceState,
)
from flexmeasures_s2.profile_steering.device_planner.nocontrol.s2_nocontrol_device_planner import (
S2NoControlDevicePlanner,
)
from flexmeasures_s2.profile_steering.device_planner.nocontrol.s2_nocontrol_device_state import (
S2NoControlDeviceState,
)

# Logger setup
import logging
Expand Down Expand Up @@ -174,6 +180,15 @@ def create_controller_tree(
congestion_point,
)
)
elif isinstance(device_state, S2NoControlDeviceState):
logger.debug("S2 NoControl planner created!")
cpc.add_device_controller(
S2NoControlDevicePlanner(
device_state,
target.metadata,
congestion_point,
)
)
# Add other device types here as needed
else:
logger.warning(
Expand Down
6 changes: 6 additions & 0 deletions flexmeasures_s2/scheduler/schedulers.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@
from flexmeasures_s2.profile_steering.device_planner.frbc.s2_frbc_device_state import (
S2FrbcDeviceState,
)
from flexmeasures_s2.profile_steering.device_planner.nocontrol.s2_nocontrol_device_planner import (
S2NoControlDevicePlanner,
)
from flexmeasures_s2.profile_steering.device_planner.nocontrol.s2_nocontrol_device_state import (
S2NoControlDeviceState,
)

# NoControl planner is on a different branch
# from flexmeasures_s2.profile_steering.device_planner.nocontrol.s2_nocontrol_device_planner import (
Expand Down
24 changes: 0 additions & 24 deletions flexmeasures_s2/scheduler/tests/test_frbc.py

This file was deleted.

Loading