Fix Handling of TimeSeriesData

Author: FBumann

flixopt/calculation.py

@@ -61,8 +61,10 @@ def __init__(
         """
         self.name = name
         if flow_system.used_in_calculation:
-            logging.warning(f'FlowSystem {flow_system} is already used in a calculation. '
-                            f'Creating a copy for Calculation "{self.name}".')
+            logger.warning(
+                f'FlowSystem {flow_system} is already used in a calculation. '
+                f'Creating a copy of the FlowSystem for Calculation "{self.name}".'
+            )
             flow_system = flow_system.copy()
 
         if active_timesteps is not None:

flixopt/core.py

@@ -51,8 +51,15 @@ class TimeSeriesData(xr.DataArray):
 
     __slots__ = ()  # No additional instance attributes - everything goes in attrs
 
-    def __init__(self, *args, aggregation_group: Optional[str] = None, aggregation_weight: Optional[float] = None,
-                 agg_group: Optional[str] = None, agg_weight: Optional[float] = None, **kwargs):
+    def __init__(
+            self,
+            *args,
+            aggregation_group: Optional[str] = None,
+            aggregation_weight: Optional[float] = None,
+            agg_group: Optional[str] = None,
+            agg_weight: Optional[float] = None,
+            **kwargs
+    ):
         """
         Args:
             *args: Arguments passed to DataArray
@@ -84,6 +91,23 @@ def __init__(self, *args, aggregation_group: Optional[str] = None, aggregation_w
         # Always mark as TimeSeriesData
         self.attrs['__timeseries_data__'] = True
 
+    def fit_to_coords(
+        self,
+        coords: Dict[str, pd.Index],
+        name: Optional[str] = None,
+    ) -> 'TimeSeriesData':
+        """Fit the data to the given coordinates. Returns a new TimeSeriesData object if the current coords are different."""
+        if self.coords.equals(xr.Coordinates(coords)):
+            return self
+
+        da = DataConverter.to_dataarray(self.data, coords=coords)
+        return self.__class__(
+            da,
+            aggregation_group=self.aggregation_group,
+            aggregation_weight=self.aggregation_weight,
+            name=name if name is not None else self.name
+        )
+
     @property
     def aggregation_group(self) -> Optional[str]:
         return self.attrs.get('aggregation_group')

flixopt/flow_system.py

@@ -343,10 +343,7 @@ def fit_to_model_coords(
         if isinstance(data, TimeSeriesData):
             try:
                 data.name = name  # Set name of previous object!
-                return TimeSeriesData(
-                    DataConverter.to_dataarray(data, coords=coords),
-                    aggregation_group=data.aggregation_group, aggregation_weight=data.aggregation_weight
-                ).rename(name)
+                return data.fit_to_coords(coords)
             except ConversionError as e:
                 raise ConversionError(
                     f'Could not convert time series data "{name}" to DataArray:\n{data}\nOriginal Error: {e}') from e