Skip to content
Snippets Groups Projects
Commit 022f0549 authored by Stéphane Adjemian's avatar Stéphane Adjemian
Browse files

Merge branch 'master' into use-dynSeries

parents 303e3845 db485235
No related branches found
No related tags found
No related merge requests found
...@@ -326,7 +326,7 @@ Adjemian (Université du Maine, Gains and Cepremap), Houtan Bastani ...@@ -326,7 +326,7 @@ Adjemian (Université du Maine, Gains and Cepremap), Houtan Bastani
(Cepremap), Michel Juillard (Banque de France), Frédéric Karamé (Cepremap), Michel Juillard (Banque de France), Frédéric Karamé
(Université du Maine, Gains and Cepremap), Junior Maih (Norges Bank), (Université du Maine, Gains and Cepremap), Junior Maih (Norges Bank),
Ferhat Mihoubi (Université Paris-Est Créteil, Epee and Cepremap), George Ferhat Mihoubi (Université Paris-Est Créteil, Epee and Cepremap), George
Perendia, Johannes Pfeifer (Universität Tübingen), Marco Ratto (JRC) Perendia, Johannes Pfeifer (University of Mannheim), Marco Ratto (JRC)
and Sébastien Villemot (Cepremap). and Sébastien Villemot (Cepremap).
Increasingly, the developer base is expanding, as tools developed by Increasingly, the developer base is expanding, as tools developed by
researchers outside of Cepremap are integrated into Dynare. Financial researchers outside of Cepremap are integrated into Dynare. Financial
......
...@@ -618,14 +618,16 @@ EstimatedParamsInitStatement::writeOutput(ostream &output, const string &basenam ...@@ -618,14 +618,16 @@ EstimatedParamsInitStatement::writeOutput(ostream &output, const string &basenam
{ {
if (symb_type == eExogenous) if (symb_type == eExogenous)
{ {
output << "tmp1 = find((estim_params_.corrx(:,1)==" << symb_id << ")) & (estim_params_.corrx(:,2)==" << symbol_table.getTypeSpecificID(it->name2)+1 << ");" << endl; output << "tmp1 = find((estim_params_.corrx(:,1)==" << symb_id << " & estim_params_.corrx(:,2)==" << symbol_table.getTypeSpecificID(it->name2)+1 << ") | "
<< "(estim_params_.corrx(:,2)==" << symb_id << " & estim_params_.corrx(:,1)==" << symbol_table.getTypeSpecificID(it->name2)+1 << "));" << endl;
output << "estim_params_.corrx(tmp1,3) = "; output << "estim_params_.corrx(tmp1,3) = ";
it->init_val->writeOutput(output); it->init_val->writeOutput(output);
output << ";" << endl; output << ";" << endl;
} }
else if (symb_type == eEndogenous) else if (symb_type == eEndogenous)
{ {
output << "tmp1 = find((estim_params_.corrn(:,1)==" << symb_id << ")) & (estim_params_.corrn(:,2)==" << symbol_table.getTypeSpecificID(it->name2)+1 << ";" << endl; output << "tmp1 = find((estim_params_.corrn(:,1)==" << symb_id << " & estim_params_.corrn(:,2)==" << symbol_table.getTypeSpecificID(it->name2)+1 << ") | "
<< "(estim_params_.corrn(:,2)==" << symb_id << " & estim_params_.corrn(:,1)==" << symbol_table.getTypeSpecificID(it->name2)+1 << "));" << endl;
output << "estim_params_.corrn(tmp1,3) = "; output << "estim_params_.corrn(tmp1,3) = ";
it->init_val->writeOutput(output); it->init_val->writeOutput(output);
output << ";" << endl; output << ";" << endl;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment