From 98f1105c3804ee32f35ea4e7e0378dee8b42cee8 Mon Sep 17 00:00:00 2001 From: Normann Date: Thu, 16 Jan 2025 18:20:39 +0100 Subject: [PATCH] Probability typo fix (#383) * Propability->Probability --- src/akkudoktoreos/devices/devices.py | 4 ++-- src/akkudoktoreos/optimization/genetic.py | 4 ++-- src/akkudoktoreos/prediction/interpolator.py | 2 +- tests/test_class_ems.py | 4 ++-- tests/test_class_ems_2.py | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/akkudoktoreos/devices/devices.py b/src/akkudoktoreos/devices/devices.py index 3dc619b..19b4f7b 100644 --- a/src/akkudoktoreos/devices/devices.py +++ b/src/akkudoktoreos/devices/devices.py @@ -11,7 +11,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.interpolator import SelfConsumptionPropabilityInterpolator +from akkudoktoreos.prediction.interpolator import SelfConsumptionProbabilityInterpolator from akkudoktoreos.utils.datetimeutil import to_duration logger = get_logger(__name__) @@ -164,7 +164,7 @@ class Devices(SingletonMixin, DevicesBase): ev: ClassVar[Battery] = Battery(provider_id="GenericBEV") home_appliance: ClassVar[HomeAppliance] = HomeAppliance(provider_id="GenericDishWasher") inverter: ClassVar[Inverter] = Inverter( - self_consumption_predictor=SelfConsumptionPropabilityInterpolator, + self_consumption_predictor=SelfConsumptionProbabilityInterpolator, battery=battery, provider_id="GenericInverter", ) diff --git a/src/akkudoktoreos/optimization/genetic.py b/src/akkudoktoreos/optimization/genetic.py index 0e43c10..aedf828 100644 --- a/src/akkudoktoreos/optimization/genetic.py +++ b/src/akkudoktoreos/optimization/genetic.py @@ -25,7 +25,7 @@ from akkudoktoreos.devices.battery import ( ) from akkudoktoreos.devices.generic import HomeAppliance, HomeApplianceParameters from akkudoktoreos.devices.inverter import Inverter, InverterParameters -from akkudoktoreos.prediction.interpolator import SelfConsumptionPropabilityInterpolator +from akkudoktoreos.prediction.interpolator import SelfConsumptionProbabilityInterpolator from akkudoktoreos.utils.utils import NumpyEncoder logger = get_logger(__name__) @@ -573,7 +573,7 @@ class optimization_problem(ConfigMixin, DevicesMixin, EnergyManagementSystemMixi ) # 1h Load to Sub 1h Load Distribution -> SelfConsumptionRate - sc = SelfConsumptionPropabilityInterpolator( + sc = SelfConsumptionProbabilityInterpolator( Path(__file__).parent.resolve() / ".." / "data" / "regular_grid_interpolator.pkl" ) diff --git a/src/akkudoktoreos/prediction/interpolator.py b/src/akkudoktoreos/prediction/interpolator.py index b2d460b..a881e68 100644 --- a/src/akkudoktoreos/prediction/interpolator.py +++ b/src/akkudoktoreos/prediction/interpolator.py @@ -7,7 +7,7 @@ import numpy as np from scipy.interpolate import RegularGridInterpolator -class SelfConsumptionPropabilityInterpolator: +class SelfConsumptionProbabilityInterpolator: def __init__(self, filepath: str | Path): self.filepath = filepath # Load the RegularGridInterpolator diff --git a/tests/test_class_ems.py b/tests/test_class_ems.py index 1a32d4c..9951674 100644 --- a/tests/test_class_ems.py +++ b/tests/test_class_ems.py @@ -16,7 +16,7 @@ from akkudoktoreos.devices.battery import ( ) from akkudoktoreos.devices.generic import HomeAppliance, HomeApplianceParameters from akkudoktoreos.devices.inverter import Inverter, InverterParameters -from akkudoktoreos.prediction.interpolator import SelfConsumptionPropabilityInterpolator +from akkudoktoreos.prediction.interpolator import SelfConsumptionProbabilityInterpolator start_hour = 1 @@ -38,7 +38,7 @@ def create_ems_instance(config_eos) -> EnergieManagementSystem: ) # 1h Load to Sub 1h Load Distribution -> SelfConsumptionRate - sc = SelfConsumptionPropabilityInterpolator( + sc = SelfConsumptionProbabilityInterpolator( Path(__file__).parent.resolve() / ".." / "src" diff --git a/tests/test_class_ems_2.py b/tests/test_class_ems_2.py index eda16ce..385d0b3 100644 --- a/tests/test_class_ems_2.py +++ b/tests/test_class_ems_2.py @@ -15,7 +15,7 @@ from akkudoktoreos.devices.battery import ( ) from akkudoktoreos.devices.generic import HomeAppliance, HomeApplianceParameters from akkudoktoreos.devices.inverter import Inverter, InverterParameters -from akkudoktoreos.prediction.interpolator import SelfConsumptionPropabilityInterpolator +from akkudoktoreos.prediction.interpolator import SelfConsumptionProbabilityInterpolator start_hour = 0 @@ -37,7 +37,7 @@ def create_ems_instance(config_eos) -> EnergieManagementSystem: ) # 1h Load to Sub 1h Load Distribution -> SelfConsumptionRate - sc = SelfConsumptionPropabilityInterpolator( + sc = SelfConsumptionProbabilityInterpolator( Path(__file__).parent.resolve() / ".." / "src"