refactor: simplify consumer system with domain time series objects (#1063)

* refactor: consumer system time series expressions

Author: frodehk

src/libecalc/domain/infrastructure/energy_components/legacy_consumer/component.py

@@ -8,7 +8,7 @@
 from libecalc.common.consumption_type import ConsumptionType
 from libecalc.common.logger import logger
 from libecalc.common.temporal_model import TemporalModel
-from libecalc.common.time_utils import Period, Periods
+from libecalc.common.time_utils import Periods
 from libecalc.common.units import Unit
 from libecalc.common.utils.nan_handling import clean_nan_values
 from libecalc.common.utils.rates import TimeSeriesBoolean, TimeSeriesFloat, TimeSeriesInt, TimeSeriesStreamDayRate
@@ -209,13 +209,9 @@ def evaluate(
         probably be changed soon.
         """
         logger.debug(f"Evaluating consumer: {self.name}")
-        regularity = self.regularity
 
         # NOTE! This function may not handle regularity 0
-        consumer_function_results = self.evaluate_consumer_temporal_model(
-            expression_evaluator=expression_evaluator,
-            regularity=regularity,
-        )
+        consumer_function_results = self.evaluate_consumer_temporal_model()
 
         aggregated_consumer_function_result = self.aggregate_consumer_function_results(
             consumer_function_results=consumer_function_results,
@@ -276,29 +272,12 @@ def evaluate(
 
     def evaluate_consumer_temporal_model(
         self,
-        expression_evaluator: ExpressionEvaluator,
-        regularity: Regularity,
     ) -> list[ConsumerOrSystemFunctionResult]:
         """Evaluate each of the models in the temporal model for this consumer."""
         results = []
-        for period, consumer_model in self._consumer_time_function.items():
-            if Period.intersects(period, expression_evaluator.get_period()):
-                start_index, end_index = period.get_period_indices(expression_evaluator.get_periods())
-                regularity_this_period = regularity.time_series.values[start_index:end_index]
-                variables_map_this_period = expression_evaluator.get_subset(
-                    start_index=start_index,
-                    end_index=end_index,
-                )
-                logger.debug(
-                    f"Evaluating {consumer_model.__class__.__name__} with"
-                    f" {len(variables_map_this_period.get_periods())} periods(s) in range"
-                    f" [{period}]"
-                )
-                consumer_function_result = consumer_model.evaluate(
-                    expression_evaluator=variables_map_this_period,
-                    regularity=regularity_this_period,
-                )
-                results.append(consumer_function_result)
+        for _period, consumer_model in self._consumer_time_function.items():
+            consumer_function_result = consumer_model.evaluate()
+            results.append(consumer_function_result)
 
         return results
 

src/libecalc/domain/infrastructure/energy_components/legacy_consumer/consumer_function/compressor_consumer_function.py

@@ -1,6 +1,5 @@
 import numpy as np
 
-from libecalc.common.variables import ExpressionEvaluator
 from libecalc.domain.infrastructure.energy_components.legacy_consumer.consumer_function import (
     ConsumerFunction,
     ConsumerFunctionResult,
@@ -55,11 +54,7 @@ def suction_pressure(self) -> TimeSeriesPressure | None:
     def discharge_pressure(self) -> TimeSeriesPressure | None:
         return self._discharge_pressure_expression
 
-    def evaluate(
-        self,
-        expression_evaluator: ExpressionEvaluator,
-        regularity: list[float],
-    ) -> ConsumerFunctionResult:
+    def evaluate(self) -> ConsumerFunctionResult:
         """Evaluate the Compressor energy usage.
         :param expression_evaluator: Variables map is the VariablesMap-object holding all the data to be evaluated.
         :param regularity:

src/libecalc/domain/infrastructure/energy_components/legacy_consumer/consumer_function/consumer_function.py

@@ -2,9 +2,8 @@
 
 from abc import ABC, abstractmethod
 
-from libecalc.common.variables import ExpressionEvaluator
 from libecalc.domain.infrastructure.energy_components.legacy_consumer.consumer_function.results import (
-    ConsumerFunctionResult,
+    ConsumerFunctionResultBase,
 )
 from libecalc.expression import Expression
 
@@ -14,11 +13,7 @@ class ConsumerFunction(ABC):
     power_loss_factor_expression: Expression
 
     @abstractmethod
-    def evaluate(
-        self,
-        expression_evaluator: ExpressionEvaluator,
-        regularity: list[float],
-    ) -> ConsumerFunctionResult:
+    def evaluate(self) -> ConsumerFunctionResultBase:
         """Referred to as ENERGY_USAGE_MODEL in yaml.
 
         Evaluation of a consumer function given a collection of time series cases

src/libecalc/domain/infrastructure/energy_components/legacy_consumer/consumer_function/direct_consumer_function.py

@@ -2,7 +2,6 @@
 
 from libecalc.common.energy_usage_type import EnergyUsageType
 from libecalc.common.units import Unit
-from libecalc.common.variables import ExpressionEvaluator
 from libecalc.domain.infrastructure.energy_components.legacy_consumer.consumer_function import (
     ConsumerFunction,
     ConsumerFunctionResult,
@@ -48,11 +47,7 @@ def power_unit(self) -> Unit | None:
             return Unit.MEGA_WATT
         return None
 
-    def evaluate(
-        self,
-        expression_evaluator: ExpressionEvaluator,
-        regularity: list[float],
-    ) -> ConsumerFunctionResult:
+    def evaluate(self) -> ConsumerFunctionResult:
         energy_usage = self._energy_usage.get_stream_day_values()
 
         energy_function_result = EnergyFunctionGenericResult(
@@ -66,7 +61,7 @@ def evaluate(
             energy_usage = self._power_loss_factor.apply(
                 energy_usage=np.asarray(energy_function_result.energy_usage, dtype=np.float64)
             )
-            power_loss_factor = self._power_loss_factor.get_values(length=len(energy_usage))
+            power_loss_factor = self._power_loss_factor.get_values()
         else:
             energy_usage = energy_function_result.energy_usage
             power_loss_factor = None

src/libecalc/domain/infrastructure/energy_components/legacy_consumer/consumer_function/pump_consumer_function.py

@@ -1,6 +1,5 @@
 import numpy as np
 
-from libecalc.common.variables import ExpressionEvaluator
 from libecalc.domain.infrastructure.energy_components.legacy_consumer.consumer_function import (
     ConsumerFunction,
     ConsumerFunctionResult,
@@ -44,11 +43,7 @@ def __init__(
         # Typically used for power line loss subsea et.c.
         self._power_loss_factor = power_loss_factor
 
-    def evaluate(
-        self,
-        expression_evaluator: ExpressionEvaluator,
-        regularity: list[float],
-    ) -> ConsumerFunctionResult:
+    def evaluate(self) -> ConsumerFunctionResult:
         """Evaluate the pump consumer function
 
         Args:
@@ -73,13 +68,13 @@ def evaluate(
             energy_usage = self._power_loss_factor.apply(
                 energy_usage=np.asarray(energy_function_result.energy_usage, dtype=np.float64)
             )
-            power_loss_factor = self._power_loss_factor.get_values(length=len(energy_usage))
+            power_loss_factor = self._power_loss_factor.get_values()
         else:
             energy_usage = energy_function_result.energy_usage
             power_loss_factor = None
 
         pump_consumer_function_result = ConsumerFunctionResult(
-            periods=expression_evaluator.get_periods(),
+            periods=self._rate.get_periods(),
             is_valid=np.asarray(energy_function_result.is_valid, dtype=bool),
             energy_function_result=energy_function_result,
             energy_usage_before_power_loss_factor=np.asarray(energy_function_result.energy_usage, dtype=np.float64),