Commit 3b53f3f1 authored by Topi Rasku's avatar Topi Rasku
Browse files

#87: `unitSizeCons` now substituted by `maxCons` in `q_maxDownward` if `unitSizeCons <= 0`

parent fcab410a
...@@ -299,7 +299,12 @@ q_maxDownward(gnu(grid, node, unit), msft(m, s, f, t)) ...@@ -299,7 +299,12 @@ q_maxDownward(gnu(grid, node, unit), msft(m, s, f, t))
* [ * [
// Online capacity restriction // Online capacity restriction
+ p_gnu(grid, node, unit, 'maxCons')${not uft_online(unit, f, t)} // Use initial maximum if no online variables + p_gnu(grid, node, unit, 'maxCons')${not uft_online(unit, f, t)} // Use initial maximum if no online variables
+ p_gnu(grid, node, unit, 'unitSizeCons') // !!! TEMPORARY SOLUTION !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ [
+ p_gnu(grid, node, unit, 'unitSizeCons')
+ p_gnu(grid, node, unit, 'maxCons')${not p_gnu(grid, node, unit, 'unitSizeCons') > 0}
]
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* [ * [
// Capacity online // Capacity online
+ v_online_LP(unit, s, f+df_central(f,t), t)${uft_onlineLP(unit, f, t)} + v_online_LP(unit, s, f+df_central(f,t), t)${uft_onlineLP(unit, f, t)}
......
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