deploy: 936ec87

core/allocation.html

@@ -574,29 +574,29 @@ <h2 data-number="5.1" class="anchored" data-anchor-id="example"><span class="hea
 <span id="cb1-17"><a href="#cb1-17" aria-hidden="true" tabindex="-1"></a><span class="fu">println</span>(p.allocation.allocation_models[<span class="fl">1</span>].problem)</span></code><button title="Copy to Clipboard" class="code-copy-button"><i class="bi"></i></button></pre></div>
 </details>
 <div class="cell-output cell-output-stdout">
-<pre><code>Min 0.05 F[(#5, #2)] + 0.05 F[(#1, #2)] + 0.05 F[(#7, #12)] + 0.05 F[(#2, #3)] + 0.05 F[(#2, #5)] + 0.05 F[(#12, #13)] + 0.05 F[(#5, #7)] + 0.05 F[(#5, #6)] + 0.05 F[(#13, #10)] + 0.05 F[(#7, #10)] + F_abs[#6] + F_abs[#13] + F_abs[#3]
+<pre><code>Min 0.05 F[(#1, #2)] + 0.05 F[(#2, #3)] + 0.05 F[(#12, #13)] + 0.05 F[(#2, #5)] + 0.05 F[(#5, #7)] + 0.05 F[(#7, #12)] + 0.05 F[(#13, #10)] + 0.05 F[(#5, #6)] + 0.05 F[(#7, #10)] + 0.05 F[(#5, #2)] + F_abs[#13] + F_abs[#6] + F_abs[#3]
 Subject to
  source[(#1, #2)] : F[(#1, #2)] ≤ 1
- flow_conservation[#2] : -F[(#5, #2)] - F[(#1, #2)] + F[(#2, #3)] + F[(#2, #5)] ≤ 0
- flow_conservation[#12] : -F[(#7, #12)] + F[(#12, #13)] ≤ 0
- flow_conservation[#5] : F[(#5, #2)] - F[(#2, #5)] + F[(#5, #7)] + F[(#5, #6)] ≤ 0
+ flow_conservation[#12] : F[(#12, #13)] - F[(#7, #12)] ≤ 0
+ flow_conservation[#2] : -F[(#1, #2)] + F[(#2, #3)] + F[(#2, #5)] - F[(#5, #2)] ≤ 0
+ flow_conservation[#5] : -F[(#2, #5)] + F[(#5, #7)] + F[(#5, #6)] + F[(#5, #2)] ≤ 0
  return_flow[#13] : F[(#13, #10)] ≤ 0
- fractional_flow[(#7, #12)] : F[(#7, #12)] - 0.4 F[(#5, #7)] ≤ 0
- F[(#5, #2)] ≥ 0
+ fractional_flow[(#7, #12)] : -0.4 F[(#5, #7)] + F[(#7, #12)] ≤ 0
  F[(#1, #2)] ≥ 0
- F[(#7, #12)] ≥ 0
  F[(#2, #3)] ≥ 0
- F[(#2, #5)] ≥ 0
  F[(#12, #13)] ≥ 0
+ F[(#2, #5)] ≥ 0
  F[(#5, #7)] ≥ 0
- F[(#5, #6)] ≥ 0
+ F[(#7, #12)] ≥ 0
  F[(#13, #10)] ≥ 0
+ F[(#5, #6)] ≥ 0
  F[(#7, #10)] ≥ 0
- abs_positive[#6] : -F[(#5, #6)] + F_abs[#6] ≥ -1.5
+ F[(#5, #2)] ≥ 0
  abs_positive[#13] : -F[(#12, #13)] + F_abs[#13] ≥ 0
+ abs_positive[#6] : -F[(#5, #6)] + F_abs[#6] ≥ -1.5
  abs_positive[#3] : -F[(#2, #3)] + F_abs[#3] ≥ 0
- abs_negative[#6] : F[(#5, #6)] + F_abs[#6] ≥ 1.5
  abs_negative[#13] : F[(#12, #13)] + F_abs[#13] ≥ 0
+ abs_negative[#6] : F[(#5, #6)] + F_abs[#6] ≥ 1.5
  abs_negative[#3] : F[(#2, #3)] + F_abs[#3] ≥ 0
 </code></pre>
 </div>

python/examples.html

@@ -555,7 +555,7 @@ <h1 data-number="2"><span class="header-section-number">2</span> Update the basi
 <span id="cb28-4"><a href="#cb28-4" aria-hidden="true" tabindex="-1"></a>ax <span class="op">=</span> df_flow.pivot_table(index<span class="op">=</span><span class="st">"time"</span>, columns<span class="op">=</span><span class="st">"edge"</span>, values<span class="op">=</span><span class="st">"flow_m3d"</span>).plot()</span>
 <span id="cb28-5"><a href="#cb28-5" aria-hidden="true" tabindex="-1"></a>ax.legend(bbox_to_anchor<span class="op">=</span>(<span class="fl">1.3</span>, <span class="dv">1</span>), title<span class="op">=</span><span class="st">"Edge"</span>)</span></code><button title="Copy to Clipboard" class="code-copy-button"><i class="bi"></i></button></pre></div>
 <div class="cell-output cell-output-display" data-execution_count="26">
-<pre><code>&lt;matplotlib.legend.Legend at 0x7fd82b3b9850&gt;</code></pre>
+<pre><code>&lt;matplotlib.legend.Legend at 0x7fabd80d6790&gt;</code></pre>
 </div>
 <div class="cell-output cell-output-display">
 <p><img src="examples_files/figure-html/cell-27-output-2.png" width="727" height="561"></p>
@@ -818,35 +818,35 @@ <h1 data-number="3"><span class="header-section-number">3</span> Model with disc
     For node ID 1 (Basin): level &gt; 15.0
 
    This yielded control state "out":
-    For node ID 2 (Pump): flow_rate = 0.0
-    For node ID 3 (Pump): flow_rate = 0.002
+    For node ID 2 (Pump): active = &lt;NA&gt;, flow_rate = 0.0, min_flow_rate = nan, max_flow_rate = nan
+    For node ID 3 (Pump): active = &lt;NA&gt;, flow_rate = 0.002, min_flow_rate = nan, max_flow_rate = nan
 
 1. At 2020-02-08 19:02:21.861000 the control node with ID 7 reached truth state TFF:
     For node ID 1 (Basin): level &gt; 5.0
     For node ID 1 (Basin): level &lt; 10.0
     For node ID 1 (Basin): level &lt; 15.0
 
    This yielded control state "none":
-    For node ID 2 (Pump): flow_rate = 0.0
-    For node ID 3 (Pump): flow_rate = 0.0
+    For node ID 2 (Pump): active = &lt;NA&gt;, flow_rate = 0.0, min_flow_rate = nan, max_flow_rate = nan
+    For node ID 3 (Pump): active = &lt;NA&gt;, flow_rate = 0.0, min_flow_rate = nan, max_flow_rate = nan
 
 2. At 2020-07-05 08:56:10.319000 the control node with ID 7 reached truth state FFF:
     For node ID 1 (Basin): level &lt; 5.0
     For node ID 1 (Basin): level &lt; 10.0
     For node ID 1 (Basin): level &lt; 15.0
 
    This yielded control state "in":
-    For node ID 2 (Pump): flow_rate = 0.002
-    For node ID 3 (Pump): flow_rate = 0.0
+    For node ID 2 (Pump): active = &lt;NA&gt;, flow_rate = 0.002, min_flow_rate = nan, max_flow_rate = nan
+    For node ID 3 (Pump): active = &lt;NA&gt;, flow_rate = 0.0, min_flow_rate = nan, max_flow_rate = nan
 
 3. At 2020-08-11 06:05:15.592000 the control node with ID 7 reached truth state TTF:
     For node ID 1 (Basin): level &gt; 5.0
     For node ID 1 (Basin): level &gt; 10.0
     For node ID 1 (Basin): level &lt; 15.0
 
    This yielded control state "none":
-    For node ID 2 (Pump): flow_rate = 0.0
-    For node ID 3 (Pump): flow_rate = 0.0
+    For node ID 2 (Pump): active = &lt;NA&gt;, flow_rate = 0.0, min_flow_rate = nan, max_flow_rate = nan
+    For node ID 3 (Pump): active = &lt;NA&gt;, flow_rate = 0.0, min_flow_rate = nan, max_flow_rate = nan
 </code></pre>
 </div>
 </div>