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

Merge branch 'dev' into trtopi_VaGeResults

# Conflicts:
#	inc/3c_inputsLoop.gms
parents c6bd9957 c40e31b3
......@@ -236,7 +236,7 @@ loop(cc(counter),
mft(mf(mSolve, f_solve), tt_interval(t))
${ord(t) > tSolveFirst + mSettings(mSolve, 't_jump')
and (mf_central(mSolve, f_solve)
or mSettings('schedule', 'forecasts') = 0)
or mSettings(mSolve, 'forecasts') = 0)
} = yes;
// Include up to forecastLength for remaining forecasts
......@@ -405,7 +405,7 @@ dt(t)${sum(ms(mSolve, s)$(not ms_central(mSolve, s)), mst_start(mSolve, s, t))}
df(f_solve(f), t_active(t))${ ord(t) <= tSolveFirst + mSettings(mSolve, 't_jump') }
= sum(mf_realization(mSolve, f_), ord(f_) - ord(f));
// If using scenarios, central forecast will be using realized data
if(mSettings('schedule', 'scenarios'),
if(mSettings(mSolve, 'scenarios'),
loop(ms_initial(mSolve, s),
df_scenario(f_solve(f), t_active(t))${ord(t) > msEnd(mSolve, s)}
= sum(mf_realization(mSolve, f_), ord(f_) - ord(f));
......
......@@ -7,7 +7,7 @@ p_sProbability(s_active(s)) = p_msProbability(mSolve, s);
* SCENRED2 parameters
ScenRedParms('red_num_leaves') = min(mSettings(mSolve, 'red_num_leaves'),
mSettings('schedule', 'scenarios'));
mSettings(mSolve, 'scenarios'));
ScenRedParms('red_percentage') = mSettings(mSolve, 'red_percentage');
ScenRedParms('scen_red') = 1$mSettings(mSolve, 'red_num_leaves'); // Reduce scenarios
ScenRedParms('tree_con') = 1$mSettings(mSolve, 'red_percentage'); // Tree construction
......
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