Add old methods

Author: FBumann

flixopt/results.py

@@ -181,22 +181,22 @@ def from_file(cls, folder: str | pathlib.Path, name: str) -> Results:
         )
 
     @classmethod
-    def from_calculation(cls, calculation: Calculation) -> Results:
-        """Create CalculationResults from a Calculation object.
+    def from_optimization(cls, optimization) -> Results:
+        """Create Results from an Optimization instance.
 
         Args:
-            calculation: Calculation object with solved model.
+            optimization: The Optimization instance to extract results from.
 
         Returns:
-            Results: New instance with extracted results.
+            Results: New instance containing the optimization results.
         """
         return cls(
-            solution=calculation.model.solution,
-            flow_system_data=calculation.flow_system.to_dataset(),
-            summary=calculation.summary,
-            model=calculation.model,
-            name=calculation.name,
-            folder=calculation.folder,
+            solution=optimization.model.solution,
+            flow_system_data=optimization.flow_system.to_dataset(),
+            summary=optimization.summary,
+            model=optimization.model,
+            name=optimization.name,
+            folder=optimization.folder,
         )
 
     def __init__(
@@ -1122,6 +1122,21 @@ def __init__(self, *args, **kwargs):
             )
         super().__init__(*args, **kwargs)
 
+    @classmethod
+    def from_calculation(cls, calculation):
+        """Create CalculationResults from a Calculation object.
+
+        DEPRECATED: Use Results.from_optimization() instead.
+        Backwards-compatible method that redirects to from_optimization().
+
+        Args:
+            calculation: Calculation object with solved model.
+
+        Returns:
+            CalculationResults: New instance with extracted results.
+        """
+        return cls.from_optimization(calculation)
+
 
 class _ElementResults:
     def __init__(self, calculation_results: Results, label: str, variables: list[str], constraints: list[str]):
@@ -2079,14 +2094,22 @@ class SegmentedResults:
     """
 
     @classmethod
-    def from_calculation(cls, calculation: SegmentedCalculation):
+    def from_optimization(cls, optimization):
+        """Create SegmentedResults from a SegmentedOptimization instance.
+
+        Args:
+            optimization: The SegmentedOptimization instance to extract results from.
+
+        Returns:
+            SegmentedResults: New instance containing the optimization results.
+        """
         return cls(
-            [calc.results for calc in calculation.sub_calculations],
-            all_timesteps=calculation.all_timesteps,
-            timesteps_per_segment=calculation.timesteps_per_segment,
-            overlap_timesteps=calculation.overlap_timesteps,
-            name=calculation.name,
-            folder=calculation.folder,
+            [calc.results for calc in optimization.sub_calculations],
+            all_timesteps=optimization.all_timesteps,
+            timesteps_per_segment=optimization.timesteps_per_segment,
+            overlap_timesteps=optimization.overlap_timesteps,
+            name=optimization.name,
+            folder=optimization.folder,
         )
 
     @classmethod
@@ -2378,6 +2401,21 @@ def __init__(self, *args, **kwargs):
             )
         super().__init__(*args, **kwargs)
 
+    @classmethod
+    def from_calculation(cls, calculation):
+        """Create SegmentedCalculationResults from a SegmentedCalculation object.
+
+        DEPRECATED: Use SegmentedResults.from_optimization() instead.
+        Backwards-compatible method that redirects to from_optimization().
+
+        Args:
+            calculation: SegmentedCalculation object with solved model.
+
+        Returns:
+            SegmentedCalculationResults: New instance with extracted results.
+        """
+        return cls.from_optimization(calculation)
+
 
 def plot_heatmap(
     data: xr.DataArray | xr.Dataset,