bug fix: change order of the way we handle expectation operators and trend vars in transformpass
parent
891dd5e2f2
commit
de28e06bc4
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue