Preprocessor update

— various refactoring and bugfixes in block decomposition
— small bugfix for PAC models
time-shift
Sébastien Villemot 2020-05-06 18:17:25 +02:00
parent 09617453ea
commit f4f296edd6
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
2 changed files with 4 additions and 4 deletions

View File

@ -604,7 +604,7 @@ Interpreter::ReadCodeFile(string file_name, CodeLoad &code)
void void
Interpreter::check_for_controlled_exo_validity(FBEGINBLOCK_ *fb, vector<s_plan> sconstrained_extended_path) Interpreter::check_for_controlled_exo_validity(FBEGINBLOCK_ *fb, vector<s_plan> sconstrained_extended_path)
{ {
vector<unsigned int> exogenous = fb->get_exogenous(); vector<int> exogenous = fb->get_exogenous();
vector<int> endogenous = fb->get_endogenous(); vector<int> endogenous = fb->get_endogenous();
for (vector<s_plan>::iterator it = sconstrained_extended_path.begin(); it != sconstrained_extended_path.end(); it++) for (vector<s_plan>::iterator it = sconstrained_extended_path.begin(); it != sconstrained_extended_path.end(); it++)
{ {
@ -627,8 +627,8 @@ Interpreter::check_for_controlled_exo_validity(FBEGINBLOCK_ *fb, vector<s_plan>
throw FatalExceptionHandling(tmp.str()); throw FatalExceptionHandling(tmp.str());
} }
} }
for (vector<unsigned int>::iterator it = exogenous.begin(); it != exogenous.end(); it++) for (auto it : exogenous)
previous_block_exogenous.push_back(*it); previous_block_exogenous.push_back(it);
} }
bool bool

@ -1 +1 @@
Subproject commit 27a8b3b70ed93e45f17e9792d0a23ea781b2b4dc Subproject commit c699d57308ed766ab6b9a6f6fd690c81d0656cb4