Update test against the deprecated stuff

Author: FBumann

tests/test_config.py

@@ -211,13 +211,6 @@ def test_attribute_modification(self):
         assert CONFIG.Modeling.big == 12345678
         assert CONFIG.Solving.mip_gap == 0.001
 
-    def test_change_logging_level_deprecated(self):
-        """Test deprecated change_logging_level function."""
-        from flixopt import change_logging_level
-
-        with pytest.warns(DeprecationWarning, match='change_logging_level is deprecated'):
-            change_logging_level('INFO')
-
     def test_exception_logging(self, capfd):
         """Test that exceptions are properly logged with tracebacks."""
         CONFIG.Logging.enable_console('INFO')

tests/test_integration.py

@@ -267,13 +267,13 @@ def modeling_calculation(self, request, flow_system_long, highs_solver):
             calc.do_modeling()
             calc.solve(highs_solver)
         elif modeling_type == 'segmented':
-            calc = fx.SegmentedCalculation('segModel', flow_system, timesteps_per_segment=96, overlap_timesteps=1)
+            calc = fx.SegmentedOptimization('segModel', flow_system, timesteps_per_segment=96, overlap_timesteps=1)
             calc.do_modeling_and_solve(highs_solver)
         elif modeling_type == 'aggregated':
-            calc = fx.AggregatedCalculation(
+            calc = fx.ClusteredOptimization(
                 'aggModel',
                 flow_system,
-                fx.AggregationParameters(
+                fx.ClusteringParameters(
                     hours_per_period=6,
                     nr_of_periods=4,
                     fix_storage_flows=False,

tests/test_scenarios.py

@@ -345,7 +345,7 @@ def test_scenarios_selection(flow_system_piecewise_conversion_scenarios):
 
     assert flow_system.scenarios.equals(flow_system_full.scenarios[0:2])
 
-    np.testing.assert_allclose(flow_system.weights.values, flow_system_full.weights[0:2])
+    np.testing.assert_allclose(flow_system.scenario_weights.values, flow_system_full.scenario_weights[0:2])
 
     calc = fx.Optimization(flow_system=flow_system, name='test_scenarios_selection', normalize_weights=False)
     calc.do_modeling()
@@ -357,8 +357,8 @@ def test_scenarios_selection(flow_system_piecewise_conversion_scenarios):
     np.testing.assert_allclose(
         calc.results.objective,
         (
-            (calc.results.solution['costs'] * flow_system.weights).sum()
-            + (calc.results.solution['Penalty'] * flow_system.weights).sum()
+            (calc.results.solution['costs'] * flow_system.scenario_weights).sum()
+            + (calc.results.solution['Penalty'] * flow_system.scenario_weights).sum()
         ).item(),
     )  ## Account for rounding errors
 
@@ -752,8 +752,8 @@ def test_weights_io_persistence():
     fs_loaded = fx.FlowSystem.from_dataset(ds)
 
     # Verify weights persisted correctly
-    np.testing.assert_allclose(fs_loaded.weights.values, fs_original.weights.values)
-    assert fs_loaded.weights.dims == fs_original.weights.dims
+    np.testing.assert_allclose(fs_loaded.scenario_weights.values, fs_original.scenario_weights.values)
+    assert fs_loaded.scenario_weights.dims == fs_original.scenario_weights.dims
 
 
 def test_weights_selection():
@@ -788,7 +788,7 @@ def test_weights_selection():
 
     # Verify weights are correctly sliced
     assert fs_subset.scenarios.equals(pd.Index(['base', 'high'], name='scenario'))
-    np.testing.assert_allclose(fs_subset.weights.values, custom_scenario_weights[[0, 2]])
+    np.testing.assert_allclose(fs_subset.scenario_weights.values, custom_scenario_weights[[0, 2]])
 
     # Verify weights are 1D with just scenario dimension (no period dimension)
-    assert fs_subset.weights.dims == ('scenario',)
+    assert fs_subset.scenario_weights.dims == ('scenario',)