Skip to content

Commit 3f03d22

Browse files
committed
ruff format
1 parent d81a150 commit 3f03d22

3 files changed

Lines changed: 13 additions & 7 deletions

File tree

flixopt/features.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,20 +213,22 @@ def _basic_modeling(self):
213213
previous_lifetime = self.parameters.previous_lifetime if self.parameters.previous_lifetime is not None else 0
214214
self.add_variables(
215215
lower=0,
216-
upper=self.parameters.maximum_or_fixed_lifetime if self.parameters.maximum_or_fixed_lifetime is not None else self._model.flow_system.years_per_year.sum('year') + previous_lifetime,
216+
upper=self.parameters.maximum_or_fixed_lifetime
217+
if self.parameters.maximum_or_fixed_lifetime is not None
218+
else self._model.flow_system.years_per_year.sum('year') + previous_lifetime,
217219
coords=self._model.get_coords(['scenario']),
218220
short_name='size|lifetime',
219221
)
220222
self.add_constraints(
221-
self.lifetime == (self.is_invested * self._model.flow_system.years_per_year).sum('year')
223+
self.lifetime
224+
== (self.is_invested * self._model.flow_system.years_per_year).sum('year')
222225
+ self.is_invested.isel(year=0) * previous_lifetime,
223226
short_name='size|lifetime',
224227
)
225228
if self.parameters.minimum_or_fixed_lifetime is not None:
226229
self.add_constraints(
227230
self.lifetime + self.is_invested.isel(year=-1) * self.parameters.minimum_or_fixed_lifetime
228-
>=
229-
self.investment_occurs * self.parameters.minimum_or_fixed_lifetime,
231+
>= self.investment_occurs * self.parameters.minimum_or_fixed_lifetime,
230232
short_name='size|lifetime|lb',
231233
)
232234

flixopt/modeling.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,15 +293,19 @@ def consecutive_duration_tracking(
293293

294294
# Initial condition: duration[0] = (duration_per_step[0] + previous_duration) * state[0]
295295
constraints['initial'] = model.add_constraints(
296-
duration.isel({duration_dim: 0}) == (duration_per_step.isel({duration_dim: 0}) + previous_duration) * state_variable.isel({duration_dim: 0}),
296+
duration.isel({duration_dim: 0})
297+
== (duration_per_step.isel({duration_dim: 0}) + previous_duration) * state_variable.isel({duration_dim: 0}),
297298
name=f'{duration.name}|initial',
298299
)
299300

300301
# Minimum duration constraint if provided
301302
if minimum_duration is not None:
302303
constraints['lb'] = model.add_constraints(
303304
duration
304-
>= (state_variable.isel({duration_dim: slice(None, -1)}) - state_variable.isel({duration_dim: slice(1, None)}))
305+
>= (
306+
state_variable.isel({duration_dim: slice(None, -1)})
307+
- state_variable.isel({duration_dim: slice(1, None)})
308+
)
305309
* minimum_duration.isel({duration_dim: slice(None, -1)}),
306310
name=f'{duration.name}|lb',
307311
)

flixopt/structure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def weights(self) -> Union[int, xr.DataArray]:
181181
weights = self.flow_system.fit_to_model_coords(
182182
'weights',
183183
1 if self.flow_system.years is None else self.flow_system.years_per_year,
184-
dims=['year', 'scenario']
184+
dims=['year', 'scenario'],
185185
)
186186

187187
return weights / weights.sum()

0 commit comments

Comments
 (0)