1. Rolling horizon notebook (08b-rolling-horizon.ipynb): Fixed arithmetic in cells 7 and 8 to reflect correct 1h resolution (336 timesteps, 96 per 4-day segment)

  2. dataset_plot_accessor.py: Moved import numpy as np from inline (line 756) to module level imports
  3. statistics_accessor.py: Added clarifying comment for the +100 offset strategy used for secondary y-axes

Author: FBumann

docs/notebooks/08b-rolling-horizon.ipynb

@@ -111,11 +111,11 @@
     "The `optimize.rolling_horizon()` method divides the time horizon into segments that are solved sequentially:\n",
     "\n",
     "```\n",
-    "Full horizon:  |---------- 1344 timesteps (14 days) ----------|\n",
+    "Full horizon:  |---------- 336 timesteps (14 days) ----------|\n",
     "                \n",
-    "Segment 1:     |==== 192 (2 days) ====|-- overlap --|\n",
-    "Segment 2:                |==== 192 (2 days) ====|-- overlap --|\n",
-    "Segment 3:                              |==== 192 (2 days) ====|-- overlap --|\n",
+    "Segment 1:     |==== 96 (4 days) ====|-- overlap --|\n",
+    "Segment 2:                |==== 96 (4 days) ====|-- overlap --|\n",
+    "Segment 3:                              |==== 96 (4 days) ====|-- overlap --|\n",
     "...                                                  \n",
     "```\n",
     "\n",
@@ -137,7 +137,7 @@
     "fs_rolling.name = 'Rolling Horizon'\n",
     "segments = fs_rolling.optimize.rolling_horizon(\n",
     "    solver,\n",
-    "    horizon=96,  # 2-day segments (192 timesteps at 15-min resolution)\n",
+    "    horizon=96,  # 4-day segments (96 timesteps at 1h resolution)\n",
     "    overlap=24,  # 1-day lookahead\n",
     ")\n",
     "time_rolling = timeit.default_timer() - start\n",
@@ -372,6 +372,18 @@
    "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.11.11"
   }
  },
  "nbformat": 4,

flixopt/dataset_plot_accessor.py

@@ -5,6 +5,7 @@
 import warnings
 from typing import Any, Literal
 
+import numpy as np
 import pandas as pd
 import plotly.express as px
 import plotly.graph_objects as go
@@ -753,8 +754,6 @@ def to_duration_curve(self, *, normalize: bool = True) -> xr.Dataset:
         Example:
             >>> ds.fxstats.to_duration_curve().fxplot.line(title='Duration Curve')
         """
-        import numpy as np
-
         if 'time' not in self._ds.dims:
             raise ValueError("Duration curve requires a 'time' dimension.")
 

flixopt/statistics_accessor.py

@@ -2104,6 +2104,7 @@ def storage(
             primary_yaxes = [key for key in fig.layout if key.startswith('yaxis')]
 
             # For each primary y-axis, create a secondary y-axis
+            # Use +100 offset to ensure secondary axes don't conflict with plotly's auto-generated axis numbers
             for i, primary_key in enumerate(sorted(primary_yaxes, key=lambda x: int(x[5:]) if x[5:] else 0)):
                 primary_num = primary_key[5:] if primary_key[5:] else '1'
                 secondary_num = int(primary_num) + 100