Improve weights

Author: FBumann

flixopt/flow_system.py

@@ -76,7 +76,7 @@ def __init__(
                 If None, the first time increment of time_series is used.
                 This is needed to calculate previous durations (for example consecutive_on_hours).
                 If you use an array, take care that its long enough to cover all previous values!
-            weights: The weights of each year and scenario. If None, all have the same weight (normalized to 1). Its recommended to scale the weights to sum up to 1.
+            weights: The weights of each year and scenario. If None, all scenarios have the same weight, while the years have the weight of their represented year (all normalized to 1). Its recommended to scale the weights to sum up to 1.
         """
         self.timesteps = self._validate_timesteps(timesteps)
         self.timesteps_extra = self._create_timesteps_with_extra(timesteps, hours_of_last_timestep)

flixopt/structure.py

@@ -178,7 +178,9 @@ def get_coords(
     def weights(self) -> Union[int, xr.DataArray]:
         """Returns the scenario weights of the FlowSystem. If None, return weights that are normalized to 1 (one)"""
         if self.flow_system.weights is None:
-            weights = self.flow_system.fit_to_model_coords('weights', 1, dims=['year', 'scenario'])
+            weights = self.flow_system.fit_to_model_coords(
+                'weights', self.flow_system.years_per_year, dims=['year', 'scenario']
+            )
 
             return weights / weights.sum()