flixopt 2.2.0b0__py3-none-any.whl → 2.2.0rc2__py3-none-any.whl

flixopt/structure.py

@@ -19,7 +19,7 @@ from rich.console import Console
 from rich.pretty import Pretty
 
 from .config import CONFIG
-from .core import Scalar, TimeSeries, TimeSeriesCollection, TimeSeriesData, TimestepData
+from .core import NumericData, Scalar, TimeSeries, TimeSeriesCollection, TimeSeriesData
 
 if TYPE_CHECKING:  # for type checking and preventing circular imports
     from .effects import EffectCollectionModel
@@ -58,7 +58,6 @@ class SystemModel(linopy.Model):
         self.flow_system = flow_system
         self.time_series_collection = flow_system.time_series_collection
         self.effects: Optional[EffectCollectionModel] = None
-        self.scenario_weights = self._calculate_scenario_weights(flow_system.scenario_weights)
 
     def do_modeling(self):
         self.effects = self.flow_system.effects.create_model(self)
@@ -70,24 +69,6 @@ class SystemModel(linopy.Model):
         for bus_model in bus_models:  # Buses after Components, because FlowModels are created in ComponentModels
             bus_model.do_modeling()
 
-    def _calculate_scenario_weights(self, weights: Optional[TimeSeries] = None) -> xr.DataArray:
-        """Calculates the weights of the scenarios. If None, all scenarios have the same weight. All weights are normalized to 1.
-        If no scenarios are present, s single weight of 1 is returned.
-        """
-        if weights is not None and not isinstance(weights, TimeSeries):
-            raise TypeError(f'Weights must be a TimeSeries or None, got {type(weights)}')
-        if self.time_series_collection.scenarios is None:
-            return xr.DataArray(1)
-        if weights is None:
-            weights = xr.DataArray(
-                np.ones(len(self.time_series_collection.scenarios)),
-                coords={'scenario': self.time_series_collection.scenarios}
-            )
-        elif isinstance(weights, TimeSeries):
-            weights = weights.selected_data
-
-        return weights / weights.sum()
-
     @property
     def solution(self):
         solution = super().solution
@@ -106,10 +87,6 @@ class SystemModel(linopy.Model):
                 effect.label_full: effect.model.results_structure()
                 for effect in sorted(self.flow_system.effects, key=lambda effect: effect.label_full.upper())
             },
-            'Flows': {
-                flow.label_full: flow.model.results_structure()
-                for flow in sorted(self.flow_system.flows.values(), key=lambda flow: flow.label_full.upper())
-            },
         }
         return solution.reindex(time=self.time_series_collection.timesteps_extra)
 
@@ -121,40 +98,13 @@ class SystemModel(linopy.Model):
     def hours_of_previous_timesteps(self):
         return self.time_series_collection.hours_of_previous_timesteps
 
-    def get_coords(
-        self, scenario_dim=True, time_dim=True, extra_timestep=False
-    ) -> Optional[Union[Tuple[pd.Index], Tuple[pd.Index, pd.Index]]]:
-        """
-        Returns the coordinates of the model
-
-        Args:
-            scenario_dim: If True, the scenario dimension is included in the coordinates
-            time_dim: If True, the time dimension is included in the coordinates
-            extra_timestep: If True, the extra timesteps are used instead of the regular timesteps
-
-        Returns:
-            The coordinates of the model. Might also be None if no scenarios are present and time_dim is False
-        """
-        if not scenario_dim and not time_dim:
-            return None
-        scenarios = self.time_series_collection.scenarios
-        timesteps = (
-            self.time_series_collection.timesteps if not extra_timestep else self.time_series_collection.timesteps_extra
-        )
-
-        if scenario_dim and time_dim:
-            if scenarios is None:
-                return (timesteps,)
-            return timesteps, scenarios
-
-        if scenario_dim and not time_dim:
-            if scenarios is None:
-                return None
-            return (scenarios,)
-        if time_dim and not scenario_dim:
-            return (timesteps,)
+    @property
+    def coords(self) -> Tuple[pd.DatetimeIndex]:
+        return (self.time_series_collection.timesteps,)
 
-        raise ValueError(f'Cannot get coordinates with both {scenario_dim=} and {time_dim=}')
+    @property
+    def coords_extra(self) -> Tuple[pd.DatetimeIndex]:
+        return (self.time_series_collection.timesteps_extra,)
 
 
 class Interface:
@@ -353,9 +303,7 @@ class Element(Interface):
 class Model:
     """Stores Variables and Constraints."""
 
-    def __init__(
-        self, model: SystemModel, label_of_element: str, label: str = '', label_full: Optional[str] = None
-    ):
+    def __init__(self, model: SystemModel, label_of_element: str, label: str = '', label_full: Optional[str] = None):
         """
         Args:
             model: The SystemModel that is used to create the model.
@@ -499,7 +447,8 @@ class ElementModel(Model):
 
     def results_structure(self):
         return {
-            'label': self.label_full,
+            'label': self.label,
+            'label_full': self.label_full,
             'variables': list(self.variables),
             'constraints': list(self.constraints),
         }
@@ -583,12 +532,9 @@ def copy_and_convert_datatypes(data: Any, use_numpy: bool = True, use_element_la
             return copy_and_convert_datatypes(data.tolist(), use_numpy, use_element_label)
 
     elif isinstance(data, TimeSeries):
-        return copy_and_convert_datatypes(data.selected_data, use_numpy, use_element_label)
+        return copy_and_convert_datatypes(data.active_data, use_numpy, use_element_label)
     elif isinstance(data, TimeSeriesData):
         return copy_and_convert_datatypes(data.data, use_numpy, use_element_label)
-    elif isinstance(data, (pd.Series, pd.DataFrame)):
-        #TODO: This can be improved
-        return copy_and_convert_datatypes(data.values, use_numpy, use_element_label)
 
     elif isinstance(data, Interface):
         if use_element_label and isinstance(data, Element):
@@ -636,8 +582,6 @@ def get_compact_representation(data: Any, array_threshold: int = 50, decimals: i
 
         def normalized_center_of_mass(array: Any) -> float:
             # position in array (0 bis 1 normiert)
-            if array.ndim >= 2:  # No good way to calculate center of mass for 2D arrays
-                return np.nan
             positions = np.linspace(0, 1, len(array))  # weights w_i
             # mass center
             if np.sum(array) == 0:

flixopt/utils.py

@@ -11,6 +11,15 @@ import xarray as xr
 logger = logging.getLogger('flixopt')
 
 
+def is_number(number_alias: Union[int, float, str]):
+    """Returns True is string is a number."""
+    try:
+        float(number_alias)
+        return True
+    except ValueError:
+        return False
+
+
 def round_floats(obj, decimals=2):
     if isinstance(obj, dict):
         return {k: round_floats(v, decimals) for k, v in obj.items()}
@@ -18,12 +27,6 @@ def round_floats(obj, decimals=2):
         return [round_floats(v, decimals) for v in obj]
     elif isinstance(obj, float):
         return round(obj, decimals)
-    elif isinstance(obj, int):
-        return obj
-    elif isinstance(obj, np.ndarray):
-        return np.round(obj, decimals).tolist()
-    elif isinstance(obj, xr.DataArray):
-        return obj.round(decimals).values.tolist()
     return obj
 
 

{flixopt-2.2.0b0.dist-info → flixopt-2.2.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flixopt
-Version: 2.2.0b0
+Version: 2.2.0rc2
 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>
@@ -22,40 +22,56 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy>=1.21.5
-Requires-Dist: PyYAML>=6.0
-Requires-Dist: linopy>=0.5.1
-Requires-Dist: netcdf4>=1.6.1
-Requires-Dist: rich>=13.0.1
+Requires-Dist: numpy<3,>=1.21.5
+Requires-Dist: pandas<3,>=2.0.0
+Requires-Dist: linopy<0.5.8,>=0.5.7
+Requires-Dist: netcdf4<2,>=1.6.1
+Requires-Dist: PyYAML<7,>=6.0.0
+Requires-Dist: rich>=13.0.0
+Requires-Dist: tomli>=2.0.1; python_version < "3.11"
 Requires-Dist: highspy>=1.5.3
-Requires-Dist: pandas<3,>=2
-Requires-Dist: matplotlib>=3.5.2
-Requires-Dist: plotly>=5.15
-Requires-Dist: tomli>=2.0.1
-Provides-Extra: dev
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: ruff; extra == "dev"
-Requires-Dist: pyvis==0.3.1; extra == "dev"
-Requires-Dist: tsam>=2.3.1; extra == "dev"
-Requires-Dist: scipy>=1.15.1; extra == "dev"
-Requires-Dist: gurobipy>=10.0; extra == "dev"
+Requires-Dist: matplotlib<4.0.0,>=3.5.2
+Requires-Dist: plotly<6.0.0,>=5.15.0
+Provides-Extra: network-viz
+Requires-Dist: dash>=3.0.0; extra == "network-viz"
+Requires-Dist: dash-cytoscape>=1.0.0; extra == "network-viz"
+Requires-Dist: dash-daq>=0.6.0; extra == "network-viz"
+Requires-Dist: networkx>=3.0.0; extra == "network-viz"
+Requires-Dist: werkzeug>=3.0.0; extra == "network-viz"
 Provides-Extra: full
-Requires-Dist: pyvis==0.3.1; extra == "full"
-Requires-Dist: tsam>=2.3.1; extra == "full"
-Requires-Dist: scipy>=1.15.1; extra == "full"
-Requires-Dist: streamlit>=1.44.0; extra == "full"
-Requires-Dist: gurobipy>=10.0; extra == "full"
+Requires-Dist: pyvis==0.3.2; extra == "full"
+Requires-Dist: tsam<3.0.0,>=2.3.1; extra == "full"
+Requires-Dist: scipy<2.0.0,>=1.15.1; extra == "full"
+Requires-Dist: gurobipy>=10.0.0; extra == "full"
+Requires-Dist: dash>=3.0.0; extra == "full"
+Requires-Dist: dash-cytoscape>=1.0.0; extra == "full"
+Requires-Dist: dash-daq>=0.6.0; extra == "full"
+Requires-Dist: networkx>=3.0.0; extra == "full"
+Requires-Dist: werkzeug>=3.0.0; extra == "full"
+Provides-Extra: dev
+Requires-Dist: pytest>=7.0.0; extra == "dev"
+Requires-Dist: ruff>=0.9.0; extra == "dev"
+Requires-Dist: pre-commit>=4.0.0; extra == "dev"
+Requires-Dist: pyvis==0.3.2; extra == "dev"
+Requires-Dist: tsam<3.0.0,>=2.3.1; extra == "dev"
+Requires-Dist: scipy<2.0.0,>=1.15.1; extra == "dev"
+Requires-Dist: gurobipy>=10.0.0; extra == "dev"
+Requires-Dist: dash>=3.0.0; extra == "dev"
+Requires-Dist: dash-cytoscape>=1.0.0; extra == "dev"
+Requires-Dist: dash-daq>=0.6.0; extra == "dev"
+Requires-Dist: networkx>=3.0.0; extra == "dev"
+Requires-Dist: werkzeug>=3.0.0; extra == "dev"
 Provides-Extra: docs
-Requires-Dist: mkdocs-material>=9.0.0; extra == "docs"
-Requires-Dist: mkdocstrings-python; extra == "docs"
-Requires-Dist: mkdocs-table-reader-plugin; extra == "docs"
-Requires-Dist: mkdocs-gen-files; extra == "docs"
-Requires-Dist: mkdocs-include-markdown-plugin; extra == "docs"
-Requires-Dist: mkdocs-literate-nav; extra == "docs"
-Requires-Dist: markdown-include; extra == "docs"
-Requires-Dist: pymdown-extensions; extra == "docs"
-Requires-Dist: pygments; extra == "docs"
-Requires-Dist: mike; extra == "docs"
+Requires-Dist: mkdocs-material<10,>=9.0.0; extra == "docs"
+Requires-Dist: mkdocstrings-python>=1.0.0; extra == "docs"
+Requires-Dist: mkdocs-table-reader-plugin>=2.0.0; extra == "docs"
+Requires-Dist: mkdocs-gen-files>=0.4.0; extra == "docs"
+Requires-Dist: mkdocs-include-markdown-plugin>=6.0.0; extra == "docs"
+Requires-Dist: mkdocs-literate-nav>=0.6.0; extra == "docs"
+Requires-Dist: markdown-include>=0.8.0; extra == "docs"
+Requires-Dist: pymdown-extensions>=10.0.0; extra == "docs"
+Requires-Dist: pygments>=2.14.0; extra == "docs"
+Requires-Dist: mike>=2.0.0; extra == "docs"
 Dynamic: license-file
 
 # FlixOpt: Energy and Material Flow Optimization Framework
@@ -78,7 +94,7 @@ Dynamic: license-file
 
 **flixopt** provides a user-friendly interface with options for advanced users.
 
-It was originally developed by [TU Dresden](https://github.com/gewv-tu-dresden) as part of the SMARTBIOGRID project, funded by the German Federal Ministry for Economic Affairs and Energy (FKZ: 03KB159B). Building on the Matlab-based flixOptMat framework (developed in the FAKS project), FlixOpt also incorporates concepts from [oemof/solph](https://github.com/oemof/oemof-solph). 
+It was originally developed by [TU Dresden](https://github.com/gewv-tu-dresden) as part of the SMARTBIOGRID project, funded by the German Federal Ministry for Economic Affairs and Energy (FKZ: 03KB159B). Building on the Matlab-based flixOptMat framework (developed in the FAKS project), FlixOpt also incorporates concepts from [oemof/solph](https://github.com/oemof/oemof-solph).
 
 ---
 
@@ -103,7 +119,7 @@ It was originally developed by [TU Dresden](https://github.com/gewv-tu-dresden)
 
 - **Calculation Modes**
     - **Full** - Solve the model with highest accuracy and computational requirements.
-    - **Segmented** - Speed up solving by using a rolling horizon. 
+    - **Segmented** - Speed up solving by using a rolling horizon.
     - **Aggregated** - Speed up solving by identifying typical periods using [TSAM](https://github.com/FZJ-IEK3-VSA/tsam). Suitable for large models.
 
 ---
@@ -125,22 +141,27 @@ The documentation is available at [https://flixopt.github.io/flixopt/latest/](ht
 
 ---
 
-## 🛠️ Solver Integration
+## 🎯️ Solver Integration
 
-By default, FlixOpt uses the open-source solver [HiGHS](https://highs.dev/) which is installed by default. However, it is compatible with additional solvers such as:  
+By default, FlixOpt uses the open-source solver [HiGHS](https://highs.dev/) which is installed by default. However, it is compatible with additional solvers such as:
 
-- [Gurobi](https://www.gurobi.com/)  
-- [CBC](https://github.com/coin-or/Cbc)  
+- [Gurobi](https://www.gurobi.com/)
+- [CBC](https://github.com/coin-or/Cbc)
 - [GLPK](https://www.gnu.org/software/glpk/)
 - [CPLEX](https://www.ibm.com/analytics/cplex-optimizer)
 
-For detailed licensing and installation instructions, refer to the respective solver documentation.  
+For detailed licensing and installation instructions, refer to the respective solver documentation.
+
+---
+
+## 🛠 Development Setup
+Look into our docs for [development setup](https://flixopt.github.io/flixopt/latest/contribute/)
 
 ---
 
 ## 📖 Citation
 
-If you use FlixOpt in your research or project, please cite the following:  
+If you use FlixOpt in your research or project, please cite the following:
 
-- **Main Citation:** [DOI:10.18086/eurosun.2022.04.07](https://doi.org/10.18086/eurosun.2022.04.07)  
-- **Short Overview:** [DOI:10.13140/RG.2.2.14948.24969](https://doi.org/10.13140/RG.2.2.14948.24969)  
+- **Main Citation:** [DOI:10.18086/eurosun.2022.04.07](https://doi.org/10.18086/eurosun.2022.04.07)
+- **Short Overview:** [DOI:10.13140/RG.2.2.14948.24969](https://doi.org/10.13140/RG.2.2.14948.24969)

flixopt-2.2.0rc2.dist-info/RECORD

@@ -0,0 +1,54 @@
+docs/examples/00-Minimal Example.md,sha256=TjtnI8o96YNOCFwRC8BSXFGoVqfB53BtvOG4b29FwkQ,80
+docs/examples/01-Basic Example.md,sha256=sZHonC6A_wtZ2IEy_6BAMY8wViyIcivmcj8GYIZ_qck,78
+docs/examples/02-Complex Example.md,sha256=5cczYkXFpzpQTNp9dkmOEdTXxoWLETKty417q6MyT8s,287
+docs/examples/03-Calculation Modes.md,sha256=FZPBXmrkir6QhQsiXwWp2sOOntIIkODCgh3lVqOrP6w,231
+docs/examples/index.md,sha256=KwXrsxxiHk563bny4I4B2X_CfPNiSXx8TsfI671MLdg,179
+docs/faq/contribute.md,sha256=CL7Z85zyPes1Kl16_8oWLU2RTTbMdPfhmvt4tsnkikU,2508
+docs/faq/index.md,sha256=MH_SPZllm_5npxPP6DHXbJlpLXZc-nbWTFJvMmZYz9Q,50
+docs/images/architecture_flixOpt-pre2.0.0.png,sha256=9RWSA3vys588aadr2437zor-_-xBTQNQ0bAf8xGcu5g,70605
+docs/images/architecture_flixOpt.png,sha256=KjN1bJwESbkHmTW7UsJ7dZyiKZlTO7Dx20dg8KlR1HU,260219
+docs/images/flixopt-icon.svg,sha256=_1a6bk2pDOVEy233LC1nM6jZ35NdzD8Hd3UqGxW1Xpg,135341
+docs/javascripts/mathjax.js,sha256=LJDaO5MM_5W8gI5-S5SiZ17qeMgeoVJO-inMyBNy7UE,402
+docs/user-guide/index.md,sha256=TBO7lk13M95w2A9WiT5asfZn9oU9GZ1O0XW9eUm5GLo,7450
+docs/user-guide/Mathematical Notation/Bus.md,sha256=pqjGa3PZBSmuO4YR44bK21bMmRcWC8dkzP3z0XX-PJw,1613
+"docs/user-guide/Mathematical Notation/Effects, Penalty & Objective.md",sha256=OZnpxhX0R6NpJNP-FJ4g3lXWTRlv-Hhpp484Wits-ZI,5664
+docs/user-guide/Mathematical Notation/Flow.md,sha256=wqUgP_SntSyzcJNxbkxa2TmApqpPaq6GZ_Qk_qcAAlw,1095
+docs/user-guide/Mathematical Notation/LinearConverter.md,sha256=9oFHIA3-QLSOV-QQ3a6je7kcIluJGZH8qtgquf5zieE,1322
+docs/user-guide/Mathematical Notation/Piecewise.md,sha256=GgTQ7dVTTb0lq14GFuuZeGYrUXtMy1wkztJLIVchchw,1993
+docs/user-guide/Mathematical Notation/Storage.md,sha256=Zk5Irnr4bxIqI2KL2wcbAg8PdFDGTxhDFlRrnvjK6Bk,2200
+docs/user-guide/Mathematical Notation/index.md,sha256=2d6k4zbKET1kg7zBt1fEdKsG8jM5j2IIe6yclMTUlDw,1254
+docs/user-guide/Mathematical Notation/others.md,sha256=z6LOzcnvfI-1qQx0Fg7Q6wSK9tAzH2d34KbW4lYNyCE,48
+flixopt/__init__.py,sha256=yW3zslmBnNDYoYTGUq1XkBL7UqpP9O1iDV1d3V00iyM,721
+flixopt/aggregation.py,sha256=xgQu2U5YEbtdDAEMjWiuP9uo_KjhzC95VNmY4ZcSX3I,16939
+flixopt/calculation.py,sha256=pj8nvAG3Vv6NHNyvhU3YbrMDogClFni5CfuJk4631Fw,19914
+flixopt/commons.py,sha256=6exWKBgcWCUjcqolw1kG6Aee4bm_6DF1kTrSUzZbs1M,1353
+flixopt/components.py,sha256=N5_xmhFtOjCJnNl-o_V12lvUxp5tUyuGQRgkUVaNnuk,36868
+flixopt/config.py,sha256=Kt8QYk7hX5qHcQUtfgjM862C6SQr4K2lDvtk_LLER8Y,9085
+flixopt/config.yaml,sha256=imzAnnhcJhIfKNTTXFB5Td7Pvk5ARn5j720k-oGGRug,392
+flixopt/core.py,sha256=vaIBRQE0w9Ro5Xe_jWHKXMLRenSS2P1Tpy9-geTuWcE,38103
+flixopt/effects.py,sha256=7kwZwfv3oRmkzc30kdjeOyB4qnyA9zxsPun1ysQdDxM,16662
+flixopt/elements.py,sha256=S89IykQmXxKTtfNn8HW6fWLdb64UePaY0vaittCAJ2M,28153
+flixopt/features.py,sha256=AI3pW8UbyYLZFDIiPtexmNRkLT7UU-ckmcse9lWRPgw,46263
+flixopt/flow_system.py,sha256=Gowg5k7LWlF6VYRHtrIbKVCKWKMrzlZQtBCfdeEq4jQ,19607
+flixopt/interface.py,sha256=Be3IWcYCLATDCoTliiv6Ky1V_srn1KiCHY3tBriVd_U,22631
+flixopt/io.py,sha256=2QKdtu2-mkzSGBIqHtUcF9UaG32nq9qcIRxZghf1hLw,11284
+flixopt/linear_converters.py,sha256=ej5V_ML_3m1k9HbDnuey6pHEpQtguYkxBXHxWyE9sq0,10936
+flixopt/network_app.py,sha256=oVdARrTDV43H5ZAypJP3dmIL4A9x-Y3ec0zZC5gS8rA,28019
+flixopt/plotting.py,sha256=wUwBSQxxwy1uui-mi2hgj6h__O6EvxCnocIbX0ewpMk,54111
+flixopt/results.py,sha256=GKSZmz0GCuJwspTC8Ot6MOKinvy_mhnDXCafb_f7uVY,35161
+flixopt/solvers.py,sha256=k1bSoiXec3asWED70-erXkgtpn2C8KRBfSZj0FLviSM,2436
+flixopt/structure.py,sha256=CZIz_8UVF56BT4tiDQYzfH4WCR-yaiZHW0--u6olHx4,26281
+flixopt/utils.py,sha256=f-_vFDvvG27-c_VMpzkv3lb79Yny4rvoSmemushbzhU,1687
+flixopt-2.2.0rc2.dist-info/licenses/LICENSE,sha256=HKsZnbrM_3Rvnr_u9cWSG90cBsj5_slaqI_z_qcxnGI,1118
+pics/architecture_flixOpt-pre2.0.0.png,sha256=9RWSA3vys588aadr2437zor-_-xBTQNQ0bAf8xGcu5g,70605
+pics/architecture_flixOpt.png,sha256=KjN1bJwESbkHmTW7UsJ7dZyiKZlTO7Dx20dg8KlR1HU,260219
+pics/flixOpt_plotting.jpg,sha256=zn7ZPAtXm5eRTxtOj86e4-PPhHpCar1jqGh7vMBgQGY,518862
+pics/flixopt-icon.svg,sha256=_1a6bk2pDOVEy233LC1nM6jZ35NdzD8Hd3UqGxW1Xpg,135341
+pics/pics.pptx,sha256=ImWeGGvjtWJ6BGruipsnZYmWtHj5sWdbw1NSFePbkC8,683344
+scripts/extract_release_notes.py,sha256=3UUE4hWhdd2t2m2x0ZpchGP-A0MvfqO2Wc5EdNN-fgE,1249
+scripts/gen_ref_pages.py,sha256=AYRtXyz78x5I_Hn0oRtGVbTxgLLj2QNyRX6vWRefPjc,1960
+tests/ressources/Zeitreihen2020.csv,sha256=kbsDTKZS0iUsNZAS7m3DohzZI_OHHWe44s3GwLvcTLw,1918412
+flixopt-2.2.0rc2.dist-info/METADATA,sha256=OVQsScG4XvEoQVhF3m3qde_FmII3gGFHVRhcwjHklc0,8232
+flixopt-2.2.0rc2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+flixopt-2.2.0rc2.dist-info/top_level.txt,sha256=DEuo4R1z7GmEp5R3pjbQEJbaPRjKHFvNX2ceiBnVOL0,32
+flixopt-2.2.0rc2.dist-info/RECORD,,

{flixopt-2.2.0b0.dist-info → flixopt-2.2.0rc2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

scripts/extract_release_notes.py

@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+"""
+Extract release notes from CHANGELOG.md for a specific version.
+Usage: python extract_release_notes.py <version>
+"""
+
+import re
+import sys
+from pathlib import Path
+
+
+def extract_release_notes(version: str) -> str:
+    """Extract release notes for a specific version from CHANGELOG.md"""
+    changelog_path = Path('CHANGELOG.md')
+
+    if not changelog_path.exists():
+        print('❌ Error: CHANGELOG.md not found', file=sys.stderr)
+        sys.exit(1)
+
+    content = changelog_path.read_text(encoding='utf-8')
+
+    # Pattern to match version section: ## [2.1.2] - 2025-06-14
+    pattern = rf'## \[{re.escape(version)}\] - [^\n]+\n(.*?)(?=\n## \[|\n\[Unreleased\]|\Z)'
+    match = re.search(pattern, content, re.DOTALL)
+
+    if not match:
+        print(f"❌ Error: No release notes found for version '{version}'", file=sys.stderr)
+        sys.exit(1)
+
+    return match.group(1).strip()
+
+
+def main():
+    if len(sys.argv) != 2:
+        print('Usage: python extract_release_notes.py <version>')
+        print('Example: python extract_release_notes.py 2.1.2')
+        sys.exit(1)
+
+    version = sys.argv[1]
+    release_notes = extract_release_notes(version)
+    print(release_notes)
+
+
+if __name__ == '__main__':
+    main()

docs/release-notes/_template.txt

@@ -1,32 +0,0 @@
-# Release v{version}
-
-**Release Date:** YYYY-MM-DD
-
-## What's New
-
-* Feature 1 - Description
-* Feature 2 - Description
-
-## Improvements
-
-* Improvement 1 - Description
-* Improvement 2 - Description
-
-## Bug Fixes
-
-* Fixed issue with X
-* Resolved problem with Y
-
-## Breaking Changes
-
-* Change 1 - Migration instructions
-* Change 2 - Migration instructions
-
-## Deprecations
-
-* Feature X will be removed in v{next_version}
-
-## Dependencies
-
-* Added dependency X v1.2.3
-* Updated dependency Y to v2.0.0

docs/release-notes/index.md

@@ -1,7 +0,0 @@
-# Release Notes
-
-This page provides links to release notes for all versions of flixopt.
-
-## Latest Release
-
-* [v2.0.0](v2.0.0.md) - 29.03.2025 - Migration from pyomo to linopy. Alround improvements in performance and usability

docs/release-notes/v2.0.0.md

@@ -1,93 +0,0 @@
-# Release v2.0.0
-
-**Release Date:** March 29, 2025
-
-## 🚀 Major Framework Changes
-
-- **Migration from Pyomo to Linopy**: Completely rebuilt the optimization foundation to use Linopy instead of Pyomo
-    - Significant performance improvements, especially for large models
-    - Internal useage of linopys mathematical modeling language
-- **xarray-Based Data Architecture**: Redesigned data handling to rely on xarray.Dataset throughout the package for:
-    - Improved solution representation and analysis
-    - Enhanced time series management
-    - Consistent serialization across all elements
-    - Reduced file size and improved performance
-- **Saving and restoring unsolved Models**: The FlowSystem is now fully serializable and can be saved to a file.
-    - Share your work with others by saving the FlowSystem to a file
-    - Load a FlowSystem from a file to extend  or modify your work
-
-## 🔧 Key Improvements
-
-### Model Handling
-
-- **Extend every flixopt model with the linopy language**: Add any additional constraint or variable to your flixopt model by using the linopy language.
-- **Full Model Export/Import**: As a result of the migration to Linopy, the linopy.Model can be exported before or after the solve.
-- **Improved Infeasible Model Handling**: Added better detection and reporting for infeasible optimization models
-- **Improved Model Documentation**: Every model can be documented in a .yaml file, containing human readable mathematical formulations of all variables and constraints. THis is used to document every Calculation.
-
-### Calculation Results and documentation: 
-The `CalculationResults` class has been completely redesigned to provide a more streamlined and intuitive interface.
-Accessing the results of a Calculation is now as simple as:
-```python
-fx.FullCalculation('Sim1', flow_system)
-calculation.solve(fx.solvers.HighsSolver())
-calculation.results  # This object can be entirely saved and reloaded to file without any information loss
-```
-This access doesn't change if you save and load the results to a file or use them in your script directly!
-
-- **Improved Documentation**: The FlowSystem as well as a model Documentation is created for every model run.
-- **Results without saving to file**: The results of a Calculation can now be properly accessed without saving the results to a file first.
-- **Unified Solution exploration**: Every `Calculation` has a `Calculation.results` attribute, which accesses the solution. This can be saved and reloaded without any information loss.
-- **Improved Calculation Results**: The results of a Calculation are now more intuitive and easier to access. The `CalculationResults` class has been completely redesigned to provide a more streamlined and intuitive interface.
-
-### Data Management & I/O
-
-- **Unified Serialization**: Standardized serialization and deserialization across all elements
-- **Compression Support**: Added data compression when saving results to reduce file size
-- **to_netcdf/from_netcdf Methods**: Added for FlowSystem and other core components
-
-### Details
-#### TimeSeries Enhancements
-
-- **xarray Integration**: Redesigned TimeSeries to depend on xr.DataArray
-- **datatypes**: Added support for more datatypes, with methods for conversion to TimeSeries
-- **Improved TimeSeriesCollection**: Enhanced indexing, representation, and dataset conversion
-- **Simplified Time Management**: Removed period concepts and focused on timesteps for more intuitive time handling
-
-## 📚 Documentation
-
-- Improved documentation of the FlixOpt API and mathematical formulations
-- **Google Style Docstrings**: Updated all docstrings to Google style format
-
-## 🔄 Dependencies
-
-- **Linopy**: Added as the core dependency replacing Pyomo
-- **xarray**: Now a critical dependency for data handling and file I/O
-- **netcdf4**: Dependency for fast and efficient file I/O
-
-### Dropped Dependencies
-- **pyomo**: Replaced by linopy as the modeling language
-
-## 📋 Migration Notes
-
-This version represents a significant architecture change. If you're upgrading:
-
-- Code that directly accessed Pyomo models will need to be updated to work with Linopy
-- Data handling now uses xarray.Dataset throughout, which may require changes in how you interact with results
-- The way labels are constructed has changed throughout the system
-- The results of calculations are now handled differently, and may require changes in how you access results
-- The framework was renamed from flixOpt to flixopt. Use `import flixopt as fx`.
-
-For complete details, please refer to the full commit history.
-
-## Installation
-
-```bash
-pip install flixopt==2.0.0
-```
-
-## Upgrading
-
-```bash
-pip install --upgrade flixopt
-```

docs/release-notes/v2.0.1.md

@@ -1,12 +0,0 @@
-# Release v2.0.1
-
-**Release Date:** 2025-04-10
-
-## 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

docs/release-notes/v2.1.0.md

@@ -1,31 +0,0 @@
-# Release v2.1.0
-
-**Release Date:** 2025-04-11
-
-## Improvements
-
-* Add logger warning if relative_minimum is used without on_off_parameters in Flow, as this prevents the flow_rate from switching "OFF"
-* Python 3.13 support added
-* Greatly improved internal testing infrastructure by leveraging linopy's testing framework
-
-## Bug Fixes
-
-* Bugfixing the lower bound of `flow_rate` when using optional investments without OnOffParameters.
-* Fixes a Bug that prevented divest effects from working.
-* added lower bounds of 0 to two unbounded vars (only numerical better)
-
-## Breaking Changes
-
-* We restructured the modeling of the On/Off state of FLows or Components. This leads to slightly renaming of variables and constraints.
-
-### Variable renaming
-* "...|consecutive_on_hours" is now "...|ConsecutiveOn|hours"
-* "...|consecutive_off_hours" is now "...|ConsecutiveOff|hours"
-
-### Constraint renaming
-* "...|consecutive_on_hours_con1" is now "...|ConsecutiveOn|con1"
-* "...|consecutive_on_hours_con2a" is now "...|ConsecutiveOn|con2a"
-* "...|consecutive_on_hours_con2b" is now "...|ConsecutiveOn|con2b"
-* "...|consecutive_on_hours_initial" is now "...|ConsecutiveOn|initial"
-* "...|consecutive_on_hours_minimum_duration" is now "...|ConsecutiveOn|minimum"
-The same goes for "...|consecutive_off..." --> "...|ConsecutiveOff|..."