Feature/rename calculation 2

CHANGELOG.md

@@ -59,6 +59,21 @@ If upgrading from v2.x, see the [v3.0.0 release notes](https://github.com/flixOp
 
 ### 💥 Breaking Changes
 
+**Class and module renaming:**
+- `FullCalculation` → `Optimization`
+- `AggregatedCalculation` → `ClusteredOptimization`
+- `SegmentedCalculation` → `SegmentedOptimization`
+- `CalculationResults` → `Results`
+- `SegmentedCalculationResults` → `SegmentedResults`
+- `Aggregation` → `Clustering`
+- `AggregationParameters` → `ClusteringParameters`
+- `AggregationModel` → `ClusteringModel`
+- Module: `calculation.py` → `optimization.py`
+- Module: `aggregation.py` → `clustering.py`
+
+Old names remain available with deprecation warnings (removed in v5.0.0).
+
+
 ### ♻️ Changed
 
 ### 🗑️ Deprecated
@@ -67,6 +82,11 @@ If upgrading from v2.x, see the [v3.0.0 release notes](https://github.com/flixOp
 
 ### 🐛 Fixed
 
+- Fixed xarray truth-value ambiguity in `main_results` buses with excess filter
+- Added validation for `nr_of_previous_values` in `SegmentedOptimization` to prevent silent indexing bugs
+- Fixed `active_timesteps` type annotation to include `None`
+- Fixed `fix_sizes()` docstring/implementation inconsistency for optional `ds` parameter
+
 ### 🔒 Security
 
 ### 📦 Dependencies

examples/00_Minmal/minimal_example.py

@@ -32,5 +32,5 @@
         ),
     )
 
-    calculation = fx.FullCalculation('Simulation1', flow_system).do_modeling().solve(fx.solvers.HighsSolver(0.01, 60))
+    calculation = fx.FullCalculation('Simulation1', flow_system).solve(fx.solvers.HighsSolver(0.01, 60))
     calculation.results['Heat'].plot_node_balance()

examples/03_Calculation_types/example_calculation_types.py

@@ -170,21 +170,21 @@
     calculations: list[fx.FullCalculation | fx.AggregatedCalculation | fx.SegmentedCalculation] = []
 
     if full:
-        calculation = fx.FullCalculation('Full', flow_system)
+        calculation = fx.FullCalculation('Full', flow_system.copy())
         calculation.do_modeling()
         calculation.solve(fx.solvers.HighsSolver(0.01 / 100, 60))
         calculations.append(calculation)
 
     if segmented:
-        calculation = fx.SegmentedCalculation('Segmented', flow_system, segment_length, overlap_length)
+        calculation = fx.SegmentedCalculation('Segmented', flow_system.copy(), segment_length, overlap_length)
         calculation.do_modeling_and_solve(fx.solvers.HighsSolver(0.01 / 100, 60))
         calculations.append(calculation)
 
     if aggregated:
         if keep_extreme_periods:
             aggregation_parameters.time_series_for_high_peaks = [TS_heat_demand]
             aggregation_parameters.time_series_for_low_peaks = [TS_electricity_demand, TS_heat_demand]
-        calculation = fx.AggregatedCalculation('Aggregated', flow_system, aggregation_parameters)
+        calculation = fx.AggregatedCalculation('Aggregated', flow_system.copy(), aggregation_parameters)
         calculation.do_modeling()
         calculation.solve(fx.solvers.HighsSolver(0.01 / 100, 60))
         calculations.append(calculation)
@@ -197,7 +197,7 @@ def get_solutions(calcs: list, variable: str) -> xr.Dataset:
                 dataarrays.append(calc.results.solution_without_overlap(variable).rename(calc.name))
             else:
                 dataarrays.append(calc.results.model.variables[variable].solution.rename(calc.name))
-        return xr.merge(dataarrays)
+        return xr.merge(dataarrays, join='outer')
 
     # --- Plotting for comparison ---
     fx.plotting.with_plotly(

flixopt/__init__.py

@@ -14,8 +14,10 @@
 
 # Import commonly used classes and functions
 from . import linear_converters, plotting, results, solvers
-from .aggregation import AggregationParameters
+
+# Import old Calculation classes for backwards compatibility (deprecated)
 from .calculation import AggregatedCalculation, FullCalculation, SegmentedCalculation
+from .clustering import AggregationParameters, ClusteringParameters  # AggregationParameters is deprecated
 from .components import (
     LinearConverter,
     Sink,
@@ -31,6 +33,9 @@
 from .flow_system import FlowSystem
 from .interface import InvestParameters, OnOffParameters, Piece, Piecewise, PiecewiseConversion, PiecewiseEffects
 
+# Import new Optimization classes
+from .optimization import ClusteredOptimization, Optimization, SegmentedOptimization
+
 __all__ = [
     'TimeSeriesData',
     'CONFIG',
@@ -45,16 +50,22 @@
     'LinearConverter',
     'Transmission',
     'FlowSystem',
+    # New Optimization classes (preferred)
+    'Optimization',
+    'ClusteredOptimization',
+    'SegmentedOptimization',
+    # Old Calculation classes (deprecated, for backwards compatibility)
     'FullCalculation',
-    'SegmentedCalculation',
     'AggregatedCalculation',
+    'SegmentedCalculation',
     'InvestParameters',
     'OnOffParameters',
     'Piece',
     'Piecewise',
     'PiecewiseConversion',
     'PiecewiseEffects',
-    'AggregationParameters',
+    'ClusteringParameters',
+    'AggregationParameters',  # Deprecated, use ClusteringParameters
     'plotting',
     'results',
     'linear_converters',