Commit a9ac0b60 authored by Topi Rasku's avatar Topi Rasku
Browse files

#87: Reverting previous commit, breaks consumption unit reserves.

parent b6506e54
...@@ -213,7 +213,7 @@ q_resDemandLargestInfeedUnit(grid, restypeDirectionNode(restype, 'up', node), un ...@@ -213,7 +213,7 @@ q_resDemandLargestInfeedUnit(grid, restypeDirectionNode(restype, 'up', node), un
; ;
* --- Maximum Downward Capacity ----------------------------------------------- * --- Maximum Downward Capacity -----------------------------------------------
q_maxDownward(gnu_output(grid, node, unit), msft(m, s, f, t)) q_maxDownward(gnu(grid, node, unit), msft(m, s, f, t))
${ gnuft(grid, node, unit, f, t) ${ gnuft(grid, node, unit, f, t)
and { and {
[ ord(t) < tSolveFirst + smax(restype, p_nReserves(node, restype, 'reserve_length')) // Unit is either providing [ ord(t) < tSolveFirst + smax(restype, p_nReserves(node, restype, 'reserve_length')) // Unit is either providing
...@@ -318,7 +318,7 @@ q_maxDownward(gnu_output(grid, node, unit), msft(m, s, f, t)) ...@@ -318,7 +318,7 @@ q_maxDownward(gnu_output(grid, node, unit), msft(m, s, f, t))
* --- Maximum Upwards Capacity ------------------------------------------------ * --- Maximum Upwards Capacity ------------------------------------------------
q_maxUpward(gnu_output(grid, node, unit), msft(m, s, f, t)) q_maxUpward(gnu(grid, node, unit), msft(m, s, f, t))
${ gnuft(grid, node, unit, f, t) ${ gnuft(grid, node, unit, f, t)
and { and {
[ ord(t) < tSolveFirst + smax(restype, p_nReserves(node, restype, 'reserve_length')) // Unit is either providing [ ord(t) < tSolveFirst + smax(restype, p_nReserves(node, restype, 'reserve_length')) // Unit is either providing
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment