From 3245a18c9143d60fde40cc0b8f1b2eb15699fbeb Mon Sep 17 00:00:00 2001 From: Daniel Mulholland Date: Sun, 8 Nov 2026 07:10:02 +1000 Subject: [PATCH] Run panel: Flow generated and the system costs sit in Analysis, beside Capacity and Cost Flow generated (Capacity on), System red cost (always) and Cost of lost flow (Capacity and Cost on) move from Project Settings and the legacy dialog into the Run panel's Analysis section. They still write SYSTEM_DATA.flowGenerated / systemRedCost / sysLostCost through the one undoable row writer; no file-format change. Manual and chapters 11 and 12 updated; the Project Settings screenshot that no longer shows anything relevant is removed. --- docs/manual.adoc | 10 +- docs/manual.html | 22 +--- new_docs/book.html | 16 ++- new_docs/chapters/ch11-capacity.adoc | 7 +- new_docs/chapters/ch12-cost.adoc | 6 +- new_docs/images/water2-sysconfig.png | Bin 61676 -> 0 bytes new_docs/tools/capture_screens.py | 14 --- raptor/gui/ui/dialogs.py | 11 -- raptor/gui/ui/inspector.py | 14 --- raptor/gui/ui/main_window.py | 6 +- raptor/gui/ui/run_experiment_mixin.py | 9 +- raptor/gui/ui/run_panel.py | 135 +++++++++++++++++++++ tests/unit/test_run_panel.py | 75 ++++++++++++ tests/unit/test_run_panel_system_values.py | 83 +++++++++++++ 14 files changed, 329 insertions(+), 79 deletions(-) delete mode 100644 new_docs/images/water2-sysconfig.png create mode 100644 tests/unit/test_run_panel_system_values.py diff --git a/docs/manual.adoc b/docs/manual.adoc index 6ae7feee..500ddb8b 100644 --- a/docs/manual.adoc +++ b/docs/manual.adoc @@ -31,7 +31,8 @@ Project Settings is the Inspector page (Model ▸ Project Settings, or the Project Settings entry in Model Explorer). It is not a modal: the page stays open beside the canvas. Run settings are edited in the Run panel; the Inspector shows read-only echoes for those fields. Model-wide fields -(units, flow generated, costs, flags) are edited here. +(units and flags) are edited here. Flow generated and the system costs +live in the Run panel, beside the Capacity and Cost analyses they feed. [cols="3,4,3",options="header"] |=== @@ -41,9 +42,6 @@ the Inspector shows read-only echoes for those fields. Model-wide fields |Term condition |The mission length (TimeSim) or failure count (FailSim) |See xref:../new_docs/book.html#ch-first-model[Your First Model] |Statistics start time |Discard everything before this time from the statistics |Warm-up / transient removal |Number of runs |Read-only echo of trials per simulation |Edit in the Run panel; more runs give tighter SEMs (xref:../new_docs/book.html#ch-trials[Many Trials]) -|Flow generated |Demand offered at the Start node each hour |xref:../new_docs/book.html#ch-capacity[Capacity analysis] -|System red cost |Cost per hour the system is fully down |xref:../new_docs/book.html#ch-cost[Cost analysis] -|Cost of lost flow |Price per unit of unmet demand |Billed against capacity shortfall |Green/Yellow threshold |Read-only echo; edit in Results ▸ Bands |Default 0.95 |Yellow/Red threshold |Read-only echo; edit in Results ▸ Bands |Default 0.90 |Ignore negative-value warning |Suppress the warning when a parameter is set negative |Off by default @@ -702,7 +700,9 @@ greyed, with the reason, while Animate is on or a run is going. |Analysis |Weak Link, Cost and Capacity. Each is a switch with its purpose -written beside it. +written beside it. Flow generated appears here once Capacity is on; the +system red cost is always editable, and the cost of lost flow appears +once both Capacity and Cost are on. |Recording |Which outputs a run collects. Additive rather than a single "level", diff --git a/docs/manual.html b/docs/manual.html index 2099b86e..d337c877 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -132,7 +132,8 @@

Model tab → Project Settings

Project Settings entry in Model Explorer). It is not a modal: the page stays open beside the canvas. Run settings are edited in the Run panel; the Inspector shows read-only echoes for those fields. Model-wide fields -(units, flow generated, costs, flags) are edited here.

+(units and flags) are edited here. Flow generated and the system costs +live in the Run panel, beside the Capacity and Cost analyses they feed.

@@ -174,21 +175,6 @@

Model tab → Project Settings

- - - - - - - - - - - - - - - @@ -1152,7 +1138,9 @@

The Run panel

+written beside it. Flow generated appears here once Capacity is on; the +system red cost is always editable, and the cost of lost flow appears +once both Capacity and Cost are on.

diff --git a/new_docs/book.html b/new_docs/book.html index 6c47df04..7a9af372 100644 --- a/new_docs/book.html +++ b/new_docs/book.html @@ -6408,13 +6408,14 @@

15.4. Two numbers per pipe

15.5. Open the model

-

Load models/Water1.rbds. In Model → Project Settings notice -two settings that were never there before:

+

Load models/Water1.rbds. In the Run panel, tick Capacity under +Analysis and look at the two settings that make it work:

Edit in the Run panel; more runs give tighter SEMs (Many Trials)

Flow generated

Demand offered at the Start node each hour

Capacity analysis

System red cost

Cost per hour the system is fully down

Cost analysis

Cost of lost flow

Price per unit of unmet demand

Billed against capacity shortfall

Green/Yellow threshold

Read-only echo; edit in Results ▸ Bands

Default 0.95

Analysis

Weak Link, Cost and Capacity. Each is a switch with its purpose -written beside it.

Recording