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