Commit d34d522f authored by Erkka Rinne's avatar Erkka Rinne
Browse files

Fix some compilation warnings

There were warnings about nested $ifthen structures and stray names
with spurious commas in symbol declarations.

(cherry picked from commit 132360e3)
parent 7a3bb355
...@@ -88,7 +88,7 @@ $eolcom // ...@@ -88,7 +88,7 @@ $eolcom //
$onempty // Allow empty data definitions $onempty // Allow empty data definitions
* Output file streams * Output file streams
files log /''/, gdx, f_info /'%output_dir%/info.txt'/; Files log /''/, gdx /''/, f_info /'%output_dir%/info.txt'/;
* Include options file to control the solver * Include options file to control the solver
$include '%input_dir%/1_options.gms'; $include '%input_dir%/1_options.gms';
......
...@@ -25,7 +25,8 @@ Scalars ...@@ -25,7 +25,8 @@ Scalars
continueLoop "Helper to stop the looping early" continueLoop "Helper to stop the looping early"
currentForecastLength "Length of the forecast in the curren solve, minimum of unchanging and decreasing forecast lengths" currentForecastLength "Length of the forecast in the curren solve, minimum of unchanging and decreasing forecast lengths"
count "General counter" count "General counter"
count_lambda, count_lambda2 "Counter for lambdas" count_lambda
count_lambda2 "Counter for lambdas"
count_sample "Counter for samples" count_sample "Counter for samples"
cum_slope "Cumulative for slope" cum_slope "Cumulative for slope"
cum_lambda "Cumulative for lambda" cum_lambda "Cumulative for lambda"
......
...@@ -416,12 +416,12 @@ loop(effLevelGroupUnit(effLevel, effGroup, unit)${ mSettingsEff(mSolve, effLeve ...@@ -416,12 +416,12 @@ loop(effLevelGroupUnit(effLevel, effGroup, unit)${ mSettingsEff(mSolve, effLeve
* --- Input data processing --------------------------------------------------- * --- Input data processing ---------------------------------------------------
* ============================================================================= * =============================================================================
$ifthen defined scenario $ifthen.scenarios defined scenario
* --- Scenario reduction ------------------------------------------------------ * --- Scenario reduction ------------------------------------------------------
if(active(mSolve, 'scenred') and mSettings('schedule', 'scenarios') > 1, if(active(mSolve, 'scenred') and mSettings('schedule', 'scenarios') > 1,
$$include 'inc/scenred.gms' $$include 'inc/scenred.gms'
); );
$endif $endif.scenarios
* --- Update probabilities ---------------------------------------------------- * --- Update probabilities ----------------------------------------------------
Option clear = p_msft_probability; Option clear = p_msft_probability;
......
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