Commit 0d818dfc authored by Erkka Rinne's avatar Erkka Rinne
Browse files

Add new set for the m, s, f, t combinations including the previous sample

This can be used in non-anticipativity constraint equations to speed up equation creation for the model.
parent a0d16a97
...@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. ...@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
- Result parameters for start-up energy consumption and start-up emissions - Result parameters for start-up energy consumption and start-up emissions
- Result parameter for realized diffusions - Result parameter for realized diffusions
- Two additional constraints to make transfer constraints tighter - Two additional constraints to make transfer constraints tighter
- New set for the m, s, f, t combinations including the previous sample
### Changed ### Changed
- Replaced commodity set with a parameter usePrice and updated results calculation related to it - Replaced commodity set with a parameter usePrice and updated results calculation related to it
......
...@@ -113,6 +113,7 @@ Sets ...@@ -113,6 +113,7 @@ Sets
mft(mType, f, t) "Combination of forecasts and t:s in the current model solve" mft(mType, f, t) "Combination of forecasts and t:s in the current model solve"
msf(mType, s, f) "Combination of samples and forecasts in the models" msf(mType, s, f) "Combination of samples and forecasts in the models"
msft(mType, s, f, t) "Combination of models, samples, forecasts and t's" msft(mType, s, f, t) "Combination of models, samples, forecasts and t's"
msft_wPrevS(mType, s, f, t, s) "Combination of models, samples, forecasts and t's with previous sample"
mst(mType, s, t) "Combination of models samples and t's" mst(mType, s, t) "Combination of models samples and t's"
sft(s, f, t) "Combination of samples, forecasts and t's in the current model solve" sft(s, f, t) "Combination of samples, forecasts and t's in the current model solve"
sft_realized(s, f, t) "Realized sft" sft_realized(s, f, t) "Realized sft"
......
...@@ -162,6 +162,7 @@ tSolveFirst = ord(tSolve); // tSolveFirst: the start of the current solve, t0 u ...@@ -162,6 +162,7 @@ tSolveFirst = ord(tSolve); // tSolveFirst: the start of the current solve, t0 u
// Initializing forecast-time structure sets // Initializing forecast-time structure sets
Option clear = p_stepLength; Option clear = p_stepLength;
Option clear = msft; Option clear = msft;
Option clear = msft_wPrevS;
Option clear = mft; Option clear = mft;
Option clear = ft; Option clear = ft;
Option clear = sft; Option clear = sft;
...@@ -361,6 +362,7 @@ loop(scenario $p_scenProbability(scenario), ...@@ -361,6 +362,7 @@ loop(scenario $p_scenProbability(scenario),
Option clear = s_prev; s_prev(s) = yes; Option clear = s_prev; s_prev(s) = yes;
); );
); );
msft_wPrevS(msft(mSolve, s, f, t), s_)$ss(s, s_) = yes;
$endif $endif
......
...@@ -97,9 +97,11 @@ $endif.debug2 ...@@ -97,9 +97,11 @@ $endif.debug2
// Update the model specific sets and the reversed dimension set // Update the model specific sets and the reversed dimension set
Options clear=mft, clear=ms, clear=msf, clear=ms_central, clear=msft; Options clear=mft, clear=ms, clear=msf, clear=ms_central, clear=msft;
Option clear=msft_wPrevS;
msft(mSolve, sft(s, f, t)) = yes; msft(mSolve, sft(s, f, t)) = yes;
Options mft < msft, ms < msft, msf < msft, mst < msft; Options mft < msft, ms < msft, msf < msft, mst < msft;
Option ms_central < ms; Option ms_central < ms;
msft_wPrevS(msft(mSolve, s, f, t), s_)$ss(s, s_) = yes;
mst_start(mSolve, s, t)$mst_start(mSolve, s, t) = ms(mSolve, s); mst_start(mSolve, s, t)$mst_start(mSolve, s, t) = ms(mSolve, s);
mst_end(mSolve, s, t)$mst_end(mSolve, s, t) = ms(mSolve, s); mst_end(mSolve, s, t)$mst_end(mSolve, s, t) = ms(mSolve, s);
......
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