Commit 977ed466 authored by Niina Helistö's avatar Niina Helistö
Browse files

Changed parameter 'p_unit(unit, *)' to 'p_unit(unit, param_unit)' in order to...

Changed parameter 'p_unit(unit, *)' to 'p_unit(unit, param_unit)' in order to avoid misspellings in the input data. Changed also sets 'op' and 'eff' to be subsets of 'param_unit'.
parent ef523e65
......@@ -83,7 +83,7 @@ Sets
sumInfes "Sum of infeasibilities"
objEst "Estimate for the best possible objective value"
objVal "Objectiv value"
/
/
* --- Efficiency Approximation Related Sets -----------------------------------
......@@ -103,14 +103,6 @@ Sets
effOnline(effSelector) "Efficiency selectors that use online variables"
/ directOnLP, directOnMIP, lambda01*lambda12 / // IMPORTANT! Online variables are generated based on this, so keep it up to date!
// Efficiency Approximation related Counters
op "Operating points in the efficiency curves, also functions as index for data points"
/op00*op12/ // IMPORTANT! Has to equal the same param_unit!
eff "Effiency for the corresponding operating point ('op') in the efficiency curves, also used for data indexing"
/eff00*eff12/ // IMPORTANT! Has to equal the same param_unit!
lambda "Lambda approximation indeces"
/lambda01*lambda12/ // IMPORTANT! Has to equal effLambda!
* --- General and Directional Sets --------------------------------------------
// General Counter
......@@ -336,6 +328,16 @@ param_policy "Set of possible data parameters for grid, node, regulation" /
constrainedCapTotalMax "Total maximum b for unit investments in equation Sum(i, a(i)*v_invest(i)) <= b"
/
* --- Efficiency Approximation Related Sets -----------------------------------
// Efficiency Approximation related Counters
op(param_unit) "Operating points in the efficiency curves, also functions as index for data points"
/op00*op12/ // IMPORTANT! Has to equal the same param_unit!
eff(param_unit) "Effiency for the corresponding operating point ('op') in the efficiency curves, also used for data indexing"
/eff00*eff12/ // IMPORTANT! Has to equal the same param_unit!
lambda "Lambda approximation indeces"
/lambda01*lambda12/ // IMPORTANT! Has to equal effLambda!
* --- Counters and Directional Sets -------------------------------------------
// Slack categories
......
......@@ -46,7 +46,7 @@ Parameters
p_gnBoundaryPropertiesForStates(grid, node, param_gnBoundaryTypes, param_gnBoundaryProperties) "Properties of different state boundaries and limits"
p_gnn(grid, node, node, param_gnn) "Data for interconnections between energy nodes"
p_gnu(grid, node, unit, param_gnu) "Unit data where energy type matters"
p_unit(unit, *) "Unit data where energy type does not matter"
p_unit(unit, param_unit) "Unit data where energy type does not matter"
p_nReserves(node, restype, *) "Data defining the reserve rules in each node"
p_nuReserves(node, unit, restype, *) "Reserve provision data for units"
p_gnPolicy(grid, node, param_policy, *) "Policy data for grid, node"
......
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