mirror of
https://github.com/Akkudoktor-EOS/EOS.git
synced 2025-04-19 08:55:15 +00:00
Pythonic: Rename self_consumption_probability.py -> interpolator.py
* Rename class self_consumption_probability_interpolator to PascalCase SelfConsumptionProbabilityInterpolator.
This commit is contained in:
parent
410a23e375
commit
053e60aca4
@ -10,9 +10,7 @@ from akkudoktoreos.devices.battery import Battery
|
||||
from akkudoktoreos.devices.devicesabc import DevicesBase
|
||||
from akkudoktoreos.devices.generic import HomeAppliance
|
||||
from akkudoktoreos.devices.inverter import Inverter
|
||||
from akkudoktoreos.prediction.self_consumption_probability import (
|
||||
self_consumption_probability_interpolator,
|
||||
)
|
||||
from akkudoktoreos.prediction.interpolator import SelfConsumptionPropabilityInterpolator
|
||||
from akkudoktoreos.utils.datetimeutil import to_duration
|
||||
from akkudoktoreos.utils.logutil import get_logger
|
||||
|
||||
@ -166,7 +164,7 @@ class Devices(SingletonMixin, DevicesBase):
|
||||
eauto: ClassVar[Battery] = Battery(provider_id="GenericBEV")
|
||||
home_appliance: ClassVar[HomeAppliance] = HomeAppliance(provider_id="GenericDishWasher")
|
||||
inverter: ClassVar[Inverter] = Inverter(
|
||||
self_consumption_predictor=self_consumption_probability_interpolator,
|
||||
self_consumption_predictor=SelfConsumptionPropabilityInterpolator,
|
||||
akku=akku,
|
||||
provider_id="GenericInverter",
|
||||
)
|
||||
|
@ -22,9 +22,7 @@ from akkudoktoreos.devices.battery import (
|
||||
)
|
||||
from akkudoktoreos.devices.generic import HomeAppliance, HomeApplianceParameters
|
||||
from akkudoktoreos.devices.inverter import Inverter, InverterParameters
|
||||
from akkudoktoreos.prediction.self_consumption_probability import (
|
||||
self_consumption_probability_interpolator,
|
||||
)
|
||||
from akkudoktoreos.prediction.interpolator import SelfConsumptionPropabilityInterpolator
|
||||
from akkudoktoreos.utils.utils import NumpyEncoder
|
||||
|
||||
|
||||
@ -524,7 +522,7 @@ class optimization_problem(ConfigMixin, DevicesMixin, EnergyManagementSystemMixi
|
||||
)
|
||||
|
||||
# 1h Load to Sub 1h Load Distribution -> SelfConsumptionRate
|
||||
sc = self_consumption_probability_interpolator(
|
||||
sc = SelfConsumptionPropabilityInterpolator(
|
||||
Path(__file__).parent.resolve() / ".." / "data" / "regular_grid_interpolator.pkl"
|
||||
)
|
||||
|
||||
|
@ -7,7 +7,7 @@ import numpy as np
|
||||
from scipy.interpolate import RegularGridInterpolator
|
||||
|
||||
|
||||
class self_consumption_probability_interpolator:
|
||||
class SelfConsumptionPropabilityInterpolator:
|
||||
def __init__(self, filepath: str | Path):
|
||||
self.filepath = filepath
|
||||
# self.interpolator = None
|
@ -17,9 +17,7 @@ from akkudoktoreos.devices.battery import (
|
||||
)
|
||||
from akkudoktoreos.devices.generic import HomeAppliance, HomeApplianceParameters
|
||||
from akkudoktoreos.devices.inverter import Inverter, InverterParameters
|
||||
from akkudoktoreos.prediction.self_consumption_probability import (
|
||||
self_consumption_probability_interpolator,
|
||||
)
|
||||
from akkudoktoreos.prediction.interpolator import SelfConsumptionPropabilityInterpolator
|
||||
|
||||
start_hour = 1
|
||||
|
||||
@ -42,7 +40,7 @@ def create_ems_instance() -> EnergieManagementSystem:
|
||||
)
|
||||
|
||||
# 1h Load to Sub 1h Load Distribution -> SelfConsumptionRate
|
||||
sc = self_consumption_probability_interpolator(
|
||||
sc = SelfConsumptionPropabilityInterpolator(
|
||||
Path(__file__).parent.resolve()
|
||||
/ ".."
|
||||
/ "src"
|
||||
|
@ -16,9 +16,7 @@ from akkudoktoreos.devices.battery import (
|
||||
)
|
||||
from akkudoktoreos.devices.generic import HomeAppliance, HomeApplianceParameters
|
||||
from akkudoktoreos.devices.inverter import Inverter, InverterParameters
|
||||
from akkudoktoreos.prediction.self_consumption_probability import (
|
||||
self_consumption_probability_interpolator,
|
||||
)
|
||||
from akkudoktoreos.prediction.interpolator import SelfConsumptionPropabilityInterpolator
|
||||
|
||||
start_hour = 0
|
||||
|
||||
@ -41,7 +39,7 @@ def create_ems_instance() -> EnergieManagementSystem:
|
||||
)
|
||||
|
||||
# 1h Load to Sub 1h Load Distribution -> SelfConsumptionRate
|
||||
sc = self_consumption_probability_interpolator(
|
||||
sc = SelfConsumptionPropabilityInterpolator(
|
||||
Path(__file__).parent.resolve()
|
||||
/ ".."
|
||||
/ "src"
|
||||
|
@ -4,9 +4,7 @@ from unittest.mock import Mock
|
||||
import pytest
|
||||
|
||||
from akkudoktoreos.devices.inverter import Inverter, InverterParameters
|
||||
from akkudoktoreos.prediction.self_consumption_probability import (
|
||||
self_consumption_probability_interpolator,
|
||||
)
|
||||
from akkudoktoreos.prediction.interpolator import SelfConsumptionPropabilityInterpolator
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
@ -19,7 +17,7 @@ def mock_battery():
|
||||
|
||||
@pytest.fixture
|
||||
def inverter(mock_battery):
|
||||
sc = self_consumption_probability_interpolator(
|
||||
sc = SelfConsumptionPropabilityInterpolator(
|
||||
Path(__file__).parent.resolve()
|
||||
/ ".."
|
||||
/ "src"
|
||||
|
Loading…
x
Reference in New Issue
Block a user