flixopt 3.2.0__tar.gz → 3.2.1__tar.gz

{flixopt-3.2.0 → flixopt-3.2.1}/CHANGELOG.md

@@ -81,6 +81,20 @@ If upgrading from v2.x, see the [v3.0.0 release notes](https://github.com/flixOp
 
 Until here -->
 
+## [3.2.1] - 2025-10-29
+
+**Summary**:
+
+If upgrading from v2.x, see the [v3.0.0 release notes](https://github.com/flixOpt/flixOpt/releases/tag/v3.0.0) and [Migration Guide](https://flixopt.github.io/flixopt/latest/user-guide/migration-guide-v3/).
+
+### 🐛 Fixed
+- Fixed resampling of FlowSystem to reset `hours_of_last_timestep` and `hours_of_previous_timesteps` properly
+
+### 👷 Development
+- Improved issue templates
+
+---
+
 ## [3.2.0] - 2025-10-26
 
 **Summary**: Enhanced plotting capabilities with consistent color management, custom plotting kwargs support, and centralized I/O handling.

{flixopt-3.2.0/flixopt.egg-info → flixopt-3.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flixopt
-Version: 3.2.0
+Version: 3.2.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>
@@ -67,7 +67,7 @@ Requires-Dist: networkx==3.0.0; extra == "dev"
 Requires-Dist: werkzeug==3.0.0; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs==1.6.1; extra == "docs"
-Requires-Dist: mkdocs-material==9.6.21; extra == "docs"
+Requires-Dist: mkdocs-material==9.6.22; extra == "docs"
 Requires-Dist: mkdocstrings-python==1.18.2; extra == "docs"
 Requires-Dist: mkdocs-table-reader-plugin==3.1.0; extra == "docs"
 Requires-Dist: mkdocs-gen-files==0.5.0; extra == "docs"

{flixopt-3.2.0 → flixopt-3.2.1}/flixopt/flow_system.py

@@ -80,7 +80,7 @@ class FlowSystem(Interface):
         timesteps: pd.DatetimeIndex,
         periods: pd.Index | None = None,
         scenarios: pd.Index | None = None,
-        hours_of_last_timestep: float | None = None,
+        hours_of_last_timestep: int | float | None = None,
         hours_of_previous_timesteps: int | float | np.ndarray | None = None,
         weights: PeriodicDataUser | None = None,
         scenario_independent_sizes: bool | list[str] = True,
@@ -929,6 +929,8 @@ class FlowSystem(Interface):
         self,
         time: str,
         method: Literal['mean', 'sum', 'max', 'min', 'first', 'last', 'std', 'var', 'median', 'count'] = 'mean',
+        hours_of_last_timestep: int | float | None = None,
+        hours_of_previous_timesteps: int | float | np.ndarray | None = None,
         **kwargs: Any,
     ) -> FlowSystem:
         """
@@ -938,10 +940,12 @@ class FlowSystem(Interface):
         Args:
             time: Resampling frequency (e.g., '3h', '2D', '1M')
             method: Resampling method. Recommended: 'mean', 'first', 'last', 'max', 'min'
+            hours_of_last_timestep: New duration of the last time step. Defaults to the last time interval of the new timesteps
+            hours_of_previous_timesteps: New duration of the previous timestep. Defaults to the first time increment of the new timesteps
             **kwargs: Additional arguments passed to xarray.resample()
 
         Returns:
-            FlowSystem: New FlowSystem with resampled data
+            FlowSystem: New resampled FlowSystem
         """
         if not self.connected_and_transformed:
             self.connect_and_transform()
@@ -975,6 +979,10 @@ class FlowSystem(Interface):
         else:
             resampled_dataset = resampled_time_data
 
+        # Let FlowSystem recalculate or use explicitly set value
+        resampled_dataset.attrs['hours_of_last_timestep'] = hours_of_last_timestep
+        resampled_dataset.attrs['hours_of_previous_timesteps'] = hours_of_previous_timesteps
+
         return self.__class__.from_dataset(resampled_dataset)
 
     @property

{flixopt-3.2.0 → flixopt-3.2.1/flixopt.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flixopt
-Version: 3.2.0
+Version: 3.2.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>
@@ -67,7 +67,7 @@ Requires-Dist: networkx==3.0.0; extra == "dev"
 Requires-Dist: werkzeug==3.0.0; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs==1.6.1; extra == "docs"
-Requires-Dist: mkdocs-material==9.6.21; extra == "docs"
+Requires-Dist: mkdocs-material==9.6.22; extra == "docs"
 Requires-Dist: mkdocstrings-python==1.18.2; extra == "docs"
 Requires-Dist: mkdocs-table-reader-plugin==3.1.0; extra == "docs"
 Requires-Dist: mkdocs-gen-files==0.5.0; extra == "docs"

{flixopt-3.2.0 → flixopt-3.2.1}/flixopt.egg-info/requires.txt

@@ -31,7 +31,7 @@ werkzeug==3.0.0
 
 [docs]
 mkdocs==1.6.1
-mkdocs-material==9.6.21
+mkdocs-material==9.6.22
 mkdocstrings-python==1.18.2
 mkdocs-table-reader-plugin==3.1.0
 mkdocs-gen-files==0.5.0

{flixopt-3.2.0 → flixopt-3.2.1}/pyproject.toml

@@ -97,7 +97,7 @@ dev = [
 # Documentation building
 docs = [
     "mkdocs==1.6.1",
-    "mkdocs-material==9.6.21",
+    "mkdocs-material==9.6.22",
     "mkdocstrings-python==1.18.2",
     "mkdocs-table-reader-plugin==3.1.0",
     "mkdocs-gen-files==0.5.0",