stepan
/
preprocessor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix: change order of the way we handle expectation operators and trend vars in transformpass

issue#70
Houtan Bastani 2011-03-21 18:36:38 +01:00
parent 891dd5e2f2
commit de28e06bc4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ModFile.cc
View File

@ -226,6 +226,9 @@ ModFile::transformPass()
if (symbol_table.predeterminedNbr() > 0) if (symbol_table.predeterminedNbr() > 0)
dynamic_model.transformPredeterminedVariables(); dynamic_model.transformPredeterminedVariables();
// Create auxiliary vars for Expectation operator
dynamic_model.substituteExpectation(mod_file_struct.partial_information);
if (nonstationary_variables) if (nonstationary_variables)
{ {
dynamic_model.detrendEquations(); dynamic_model.detrendEquations();
@ -233,9 +236,6 @@ ModFile::transformPass()
dynamic_model.removeTrendVariableFromEquations(); dynamic_model.removeTrendVariableFromEquations();
} }
// Create auxiliary vars for Expectation operator
dynamic_model.substituteExpectation(mod_file_struct.partial_information);
if (mod_file_struct.stoch_simul_present if (mod_file_struct.stoch_simul_present
|| mod_file_struct.estimation_present || mod_file_struct.estimation_present
|| mod_file_struct.osr_present || mod_file_struct.osr_present