Skip to content

Commit 5fd05e3

Browse files
committed
ruff check
1 parent 2d9c920 commit 5fd05e3

9 files changed

Lines changed: 13 additions & 15 deletions

File tree

flixopt/aggregation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
from .flow_system import FlowSystem
2828
from .structure import (
2929
Element,
30-
Submodel,
3130
FlowSystemModel,
31+
Submodel,
3232
)
3333

3434
if TYPE_CHECKING:

flixopt/components.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
from .elements import Component, ComponentModel, Flow
1515
from .features import InvestmentModel, OnOffModel, PiecewiseModel
1616
from .interface import InvestParameters, OnOffParameters, PiecewiseConversion
17+
from .modeling import BoundingPatterns
1718
from .structure import FlowSystemModel, register_class_for_io
18-
from.modeling import BoundingPatterns
1919

2020
if TYPE_CHECKING:
2121
from .flow_system import FlowSystem

flixopt/effects.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
from .core import Scalar, TemporalData, TemporalDataUser
1717
from .features import ShareAllocationModel
18-
from .structure import Element, ElementModel, Interface, Submodel, FlowSystemModel, register_class_for_io
18+
from .structure import Element, ElementModel, FlowSystemModel, Interface, Submodel, register_class_for_io
1919

2020
if TYPE_CHECKING:
2121
from .flow_system import FlowSystem

flixopt/elements.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
from .config import CONFIG
1414
from .core import PlausibilityError, Scalar, TemporalData, TemporalDataUser
1515
from .effects import TemporalEffectsUser
16-
from .features import InvestmentModel, OnOffModel, ModelingPrimitives
16+
from .features import InvestmentModel, ModelingPrimitives, OnOffModel
1717
from .interface import InvestParameters, OnOffParameters
18-
from .structure import Element, ElementModel, FlowSystemModel, register_class_for_io
1918
from .modeling import BoundingPatterns, ModelingUtilitiesAbstract
19+
from .structure import Element, ElementModel, FlowSystemModel, register_class_for_io
2020

2121
if TYPE_CHECKING:
2222
from .flow_system import FlowSystem
@@ -626,7 +626,6 @@ def _do_modeling(self):
626626

627627
if self.element.prevent_simultaneous_flows:
628628
# Simultanious Useage --> Only One FLow is On at a time, but needs a Binary for every flow
629-
on_variables = [flow.submodel.on_off.on for flow in self.element.prevent_simultaneous_flows]
630629
ModelingPrimitives.mutual_exclusivity_constraint(
631630
self,
632631
binary_variables=[flow.submodel.on_off.on for flow in self.element.prevent_simultaneous_flows],

flixopt/features.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import numpy as np
1111

1212
from .config import CONFIG
13-
from .core import NonTemporalData, Scalar, TemporalData, FlowSystemDimensions
13+
from .core import FlowSystemDimensions, NonTemporalData, Scalar, TemporalData
1414
from .interface import InvestParameters, OnOffParameters, Piecewise, PiecewiseEffects
15-
from .structure import Submodel, FlowSystemModel
16-
from .modeling import ModelingUtilities, ModelingPrimitives, BoundingPatterns
15+
from .modeling import BoundingPatterns, ModelingPrimitives, ModelingUtilities
16+
from .structure import FlowSystemModel, Submodel
1717

1818
logger = logging.getLogger('flixopt')
1919

flixopt/flow_system.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
TemporalEffectsUser,
3333
)
3434
from .elements import Bus, Component, Flow
35-
from .structure import Element, Interface, FlowSystemModel
35+
from .structure import Element, FlowSystemModel, Interface
3636

3737
if TYPE_CHECKING:
3838
import pyvis

flixopt/modeling.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import xarray as xr
77

88
from .config import CONFIG
9-
from .core import NonTemporalData, Scalar, TemporalData, FlowSystemDimensions
10-
from .structure import Submodel, FlowSystemModel
9+
from .core import FlowSystemDimensions, NonTemporalData, Scalar, TemporalData
10+
from .structure import FlowSystemModel, Submodel
1111

1212
logger = logging.getLogger('flixopt')
1313

flixopt/structure.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import logging
99
import pathlib
1010
from io import StringIO
11-
from typing import TYPE_CHECKING, Any, Dict, List, Literal, Optional, Tuple, Union, Collection
11+
from typing import TYPE_CHECKING, Any, Collection, Dict, List, Literal, Optional, Tuple, Union
1212

1313
import linopy
1414
import numpy as np
@@ -19,7 +19,7 @@
1919

2020
from . import io as fx_io
2121
from .config import CONFIG
22-
from .core import NonTemporalData, Scalar, TemporalDataUser, TimeSeriesData, get_dataarray_stats, FlowSystemDimensions
22+
from .core import FlowSystemDimensions, NonTemporalData, Scalar, TemporalDataUser, TimeSeriesData, get_dataarray_stats
2323

2424
if TYPE_CHECKING: # for type checking and preventing circular imports
2525
from .effects import EffectCollectionModel

tests/test_flow.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,6 @@ def test_consecutive_on_hours_previous(self, basic_flow_system_linopy):
641641
'Sink(Wärme)|consecutive_on_hours|forward',
642642
'Sink(Wärme)|consecutive_on_hours|backward',
643643
'Sink(Wärme)|consecutive_on_hours|initial',
644-
'Sink(Wärme)|consecutive_on_hours|lb',
645644
}.issubset(set(flow.submodel.constraints))
646645

647646
assert_var_equal(

0 commit comments

Comments
 (0)