Skip to content

Commit 9db06e4

Browse files
committed
Move distribution algorithm into power distributing actor package
The power distributing algorithm is a lower level functionality, that is used only by the power distributing actor. So it shouldn't be part of the public interface. Signed-off-by: Sahas Subramanian <[email protected]>
1 parent 10a763b commit 9db06e4

File tree

6 files changed

+15
-7
lines changed

6 files changed

+15
-7
lines changed

src/frequenz/sdk/power/_distribution_algorithm.py renamed to src/frequenz/sdk/actor/power_distributing/_distribution_algorithm/_distribution_algorithm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
from frequenz.sdk._internal._math import is_close_to_zero
1212

13-
from ..microgrid.component import BatteryData, InverterData
13+
from ....microgrid.component import BatteryData, InverterData
1414

1515
_logger = logging.getLogger(__name__)
1616

src/frequenz/sdk/actor/power_distributing/power_distributing.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,12 @@
3636
ComponentCategory,
3737
InverterData,
3838
)
39-
from ...power import DistributionAlgorithm, DistributionResult, InvBatPair
4039
from ._battery_pool_status import BatteryPoolStatus, BatteryStatus
40+
from ._distribution_algorithm import (
41+
DistributionAlgorithm,
42+
DistributionResult,
43+
InvBatPair,
44+
)
4145
from .request import Request
4246
from .result import Error, OutOfBound, PartialFailure, PowerBounds, Result, Success
4347

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# License: MIT
22
# Copyright © 2022 Frequenz Energy-as-a-Service GmbH
33

4-
"""Test power distribution module."""
4+
"""Tests for the power distributing actor and algorithm."""

tests/power/test_distribution_algorithm.py renamed to tests/actor/power_distributing/test_distribution_algorithm.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@
1010

1111
from pytest import approx, raises
1212

13+
from frequenz.sdk.actor.power_distributing._distribution_algorithm import (
14+
DistributionAlgorithm,
15+
DistributionResult,
16+
InvBatPair,
17+
)
1318
from frequenz.sdk.actor.power_distributing.result import PowerBounds
1419
from frequenz.sdk.microgrid.component import BatteryData, InverterData
15-
from frequenz.sdk.power import DistributionAlgorithm, DistributionResult, InvBatPair
1620

17-
from ..utils.component_data_wrapper import BatteryDataWrapper, InverterDataWrapper
21+
from ...utils.component_data_wrapper import BatteryDataWrapper, InverterDataWrapper
1822

1923

2024
@dataclass

tests/actor/test_power_distributing.py renamed to tests/actor/power_distributing/test_power_distributing.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
from frequenz.sdk.microgrid.component import ComponentCategory
3434
from tests.timeseries.mock_microgrid import MockMicrogrid
3535

36-
from ..conftest import SAFETY_TIMEOUT
37-
from ..power.test_distribution_algorithm import Bound, Metric, battery_msg, inverter_msg
36+
from ...conftest import SAFETY_TIMEOUT
37+
from .test_distribution_algorithm import Bound, Metric, battery_msg, inverter_msg
3838

3939
T = TypeVar("T") # Declare type variable
4040

0 commit comments

Comments
 (0)