flixopt 2.0.0__tar.gz → 2.0.1__tar.gz

{flixopt-2.0.0 → flixopt-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flixopt
-Version: 2.0.0
+Version: 2.0.1
 Summary: Vector based energy and material flow optimization framework in Python.
 Author-email: "Chair of Building Energy Systems and Heat Supply, TU Dresden" <peter.stange@tu-dresden.de>, Felix Bumann <felixbumann387@gmail.com>, Felix Panitz <baumbude@googlemail.com>, Peter Stange <peter.stange@tu-dresden.de>
 Maintainer-email: Felix Bumann <felixbumann387@gmail.com>, Peter Stange <peter.stange@tu-dresden.de>
@@ -120,7 +120,7 @@ We recommend installing FlixOpt with all dependencies, which enables additional
 
 ## 📚 Documentation
 
-The documentation is available at [https://flixopt.github.io/flixopt/](https://flixopt.github.io/flixopt/)
+The documentation is available at [https://flixopt.github.io/flixopt/latest/](https://flixopt.github.io/flixopt/latest/)
 
 ---
 

{flixopt-2.0.0 → flixopt-2.0.1}/README.md

@@ -61,7 +61,7 @@ We recommend installing FlixOpt with all dependencies, which enables additional
 
 ## 📚 Documentation
 
-The documentation is available at [https://flixopt.github.io/flixopt/](https://flixopt.github.io/flixopt/)
+The documentation is available at [https://flixopt.github.io/flixopt/latest/](https://flixopt.github.io/flixopt/latest/)
 
 ---
 

flixopt-2.0.1/docs/release-notes/v2.0.1.md

@@ -0,0 +1,12 @@
+# Release v2.0.1
+
+**Release Date:** 2025-04-20
+
+## Improvements
+
+* Add logger warning if relative_minimum is used without on_off_parameters in Flow, as this prevents the flow_rate from switching "OFF"
+
+## Bug Fixes
+
+* Replace "|" with "__" in filenames when saving figures, as "|" can lead to issues on windows
+* Fixed a Bug that prevented the load factor from working without InvestmentParameters

{flixopt-2.0.0 → flixopt-2.0.1}/flixopt/core.py

@@ -426,8 +426,64 @@ class TimeSeries:
             True if all values in this TimeSeries are greater than other
         """
         if isinstance(other, TimeSeries):
-            return (self.active_data > other.active_data).all().item()
-        return NotImplemented
+            return self.active_data > other.active_data
+        return self.active_data > other
+
+    def __ge__(self, other):
+        """
+        Compare if this TimeSeries is greater than or equal to another.
+
+        Args:
+            other: Another TimeSeries to compare with
+
+        Returns:
+            True if all values in this TimeSeries are greater than or equal to other
+        """
+        if isinstance(other, TimeSeries):
+            return self.active_data >= other.active_data
+        return self.active_data >= other
+
+    def __lt__(self, other):
+        """
+        Compare if this TimeSeries is less than another.
+
+        Args:
+            other: Another TimeSeries to compare with
+
+        Returns:
+            True if all values in this TimeSeries are less than other
+        """
+        if isinstance(other, TimeSeries):
+            return self.active_data < other.active_data
+        return self.active_data < other
+
+    def __le__(self, other):
+        """
+        Compare if this TimeSeries is less than or equal to another.
+
+        Args:
+            other: Another TimeSeries to compare with
+
+        Returns:
+            True if all values in this TimeSeries are less than or equal to other
+        """
+        if isinstance(other, TimeSeries):
+            return self.active_data <= other.active_data
+        return self.active_data <= other
+
+    def __eq__(self, other):
+        """
+        Compare if this TimeSeries is equal to another.
+
+        Args:
+            other: Another TimeSeries to compare with
+
+        Returns:
+            True if all values in this TimeSeries are equal to other
+        """
+        if isinstance(other, TimeSeries):
+            return self.active_data == other.active_data
+        return self.active_data == other
 
     def __array_ufunc__(self, ufunc, method, *inputs, **kwargs):
         """
@@ -843,7 +899,7 @@ class TimeSeriesCollection:
         if isinstance(item, str):
             return item in self.time_series_data
         elif isinstance(item, TimeSeries):
-            return item in self.time_series_data.values()
+            return any([item is ts for ts in self.time_series_data.values()])
         return False
 
     @property

{flixopt-2.0.0 → flixopt-2.0.1}/flixopt/elements.py

@@ -115,7 +115,7 @@ class Bus(Element):
         )
 
     def _plausibility_checks(self) -> None:
-        if self.excess_penalty_per_flow_hour == 0:
+        if self.excess_penalty_per_flow_hour is not None and (self.excess_penalty_per_flow_hour == 0).all():
             logger.warning(f'In Bus {self.label}, the excess_penalty_per_flow_hour is 0. Use "None" or a value > 0.')
 
     @property
@@ -277,6 +277,13 @@ class Flow(Element):
                 f'if you want to allow flows to be switched on and off.'
             )
 
+        if (self.relative_minimum > 0).any() and self.on_off_parameters is None:
+            logger.warning(
+                f'Flow {self.label} has a relative_minimum of {self.relative_minimum.active_data} and no on_off_parameters. '
+                f'This prevents the flow_rate from switching off (flow_rate = 0). '
+                f'Consider using on_off_parameters to allow the flow to be switched on and off.'
+            )
+
     @property
     def label_full(self) -> str:
         return f'{self.component}({self.label})'
@@ -389,14 +396,13 @@ class FlowModel(ElementModel):
             flow_hours_per_size_max = self._model.hours_per_step.sum() * self.element.load_factor_max
             size = self.element.size if self._investment is None else self._investment.size
 
-            if self._investment is not None:
-                self.add(
-                    self._model.add_constraints(
-                        self.total_flow_hours <= size * flow_hours_per_size_max,
-                        name=f'{self.label_full}|{name_short}',
-                    ),
-                    name_short,
-                )
+            self.add(
+                self._model.add_constraints(
+                    self.total_flow_hours <= size * flow_hours_per_size_max,
+                    name=f'{self.label_full}|{name_short}',
+                ),
+                name_short,
+            )
 
         #  eq: size * sum(dt)* load_factor_min <= var_sumFlowHours
         if self.element.load_factor_min is not None:
@@ -404,14 +410,13 @@ class FlowModel(ElementModel):
             flow_hours_per_size_min = self._model.hours_per_step.sum() * self.element.load_factor_min
             size = self.element.size if self._investment is None else self._investment.size
 
-            if self._investment is not None:
-                self.add(
-                    self._model.add_constraints(
-                        self.total_flow_hours >= size * flow_hours_per_size_min,
-                        name=f'{self.label_full}|{name_short}',
-                    ),
-                    name_short,
-                )
+            self.add(
+                self._model.add_constraints(
+                    self.total_flow_hours >= size * flow_hours_per_size_min,
+                    name=f'{self.label_full}|{name_short}',
+                ),
+                name_short,
+            )
 
     @property
     def absolute_flow_rate_bounds(self) -> Tuple[NumericData, NumericData]:

{flixopt-2.0.0 → flixopt-2.0.1}/flixopt/plotting.py

@@ -32,7 +32,9 @@ _portland_colors = [
     [217 / 255, 30 / 255, 30 / 255],  # Red
 ]
 
-plt.colormaps.register(mcolors.LinearSegmentedColormap.from_list('portland', _portland_colors))
+# Check if the colormap already exists before registering it
+if 'portland' not in plt.colormaps:
+    plt.colormaps.register(mcolors.LinearSegmentedColormap.from_list('portland', _portland_colors))
 
 
 ColorType = Union[str, List[str], Dict[str, str]]
@@ -1309,6 +1311,7 @@ def export_figure(
         TypeError: If the figure type is not supported.
     """
     filename = user_path or default_path
+    filename = filename.with_name(filename.name.replace('|', '__'))
     if filename.suffix == '':
         if default_filetype is None:
             raise ValueError('No default filetype provided')

{flixopt-2.0.0 → flixopt-2.0.1}/flixopt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flixopt
-Version: 2.0.0
+Version: 2.0.1
 Summary: Vector based energy and material flow optimization framework in Python.
 Author-email: "Chair of Building Energy Systems and Heat Supply, TU Dresden" <peter.stange@tu-dresden.de>, Felix Bumann <felixbumann387@gmail.com>, Felix Panitz <baumbude@googlemail.com>, Peter Stange <peter.stange@tu-dresden.de>
 Maintainer-email: Felix Bumann <felixbumann387@gmail.com>, Peter Stange <peter.stange@tu-dresden.de>
@@ -120,7 +120,7 @@ We recommend installing FlixOpt with all dependencies, which enables additional
 
 ## 📚 Documentation
 
-The documentation is available at [https://flixopt.github.io/flixopt/](https://flixopt.github.io/flixopt/)
+The documentation is available at [https://flixopt.github.io/flixopt/latest/](https://flixopt.github.io/flixopt/latest/)
 
 ---
 

{flixopt-2.0.0 → flixopt-2.0.1}/flixopt.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ docs/javascripts/mathjax.js
 docs/release-notes/_template.txt
 docs/release-notes/index.md
 docs/release-notes/v2.0.0.md
+docs/release-notes/v2.0.1.md
 docs/user-guide/index.md
 docs/user-guide/Mathematical Notation/Bus.md
 docs/user-guide/Mathematical Notation/Effects, Penalty & Objective.md

{flixopt-2.0.0 → flixopt-2.0.1}/tests/test_timeseries.py

@@ -268,13 +268,13 @@ class TestTimeSeries:
         ts2 = TimeSeries(data2, 'Series 2')
 
         # Test __gt__ method
-        assert (ts1 > ts2) is True  # All values in ts1 are greater than ts2
+        assert (ts1 > ts2).all().item()
 
         # Test with mixed values
         data3 = xr.DataArray([5, 25, 15, 45, 25], coords={'time': sample_timesteps}, dims=['time'])
         ts3 = TimeSeries(data3, 'Series 3')
 
-        assert (ts1 > ts3) is False  # Not all values in ts1 are greater than ts3
+        assert not (ts1 > ts3).all().item()  # Not all values in ts1 are greater than ts3
 
     def test_numpy_ufunc(self, sample_timeseries):
         """Test numpy ufunc compatibility."""