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

Fix bug in wrapper functions (*_{dynamic,static}_resid_g1{,_g2,_g2_g3}.m) 

The last argument (T_flag) was missing in the function definitions (but it was
used in some function calls).
issue#70
Sébastien Villemot 2018-05-23 17:32:50 +02:00
parent 3fa14031a2
commit 41d7496b46
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/DynamicModel.cc
View File

@ -2162,30 +2162,31 @@ DynamicModel::writeWrapperFunctions(const string &basename, const string &ending
}
if (ending == "g1")
output << "function [residual, g1] = " << name << "(T, y, x, params, steady_state, it_)" << endl
<< "% function [residual, g1] = " << name << "(T, y, x, params, steady_state, it_)" << endl;
output << "function [residual, g1] = " << name << "(T, y, x, params, steady_state, it_, T_flag)" << endl
<< "% function [residual, g1] = " << name << "(T, y, x, params, steady_state, it_, T_flag)" << endl;
else if (ending == "g2")
output << "function [residual, g1, g2] = " << name << "(T, y, x, params, steady_state, it_)" << endl
<< "% function [residual, g1, g2] = " << name << "(T, y, x, params, steady_state, it_)" << endl;
output << "function [residual, g1, g2] = " << name << "(T, y, x, params, steady_state, it_, T_flag)" << endl
<< "% function [residual, g1, g2] = " << name << "(T, y, x, params, steady_state, it_, T_flag)" << endl;
else if (ending == "g3")
output << "function [residual, g1, g2, g3] = " << name << "(T, y, x, params, steady_state, it_)" << endl
<< "% function [residual, g1, g2, g3] = " << name << "(T, y, x, params, steady_state, it_)" << endl;
output << "function [residual, g1, g2, g3] = " << name << "(T, y, x, params, steady_state, it_, T_flag)" << endl
<< "% function [residual, g1, g2, g3] = " << name << "(T, y, x, params, steady_state, it_, T_flag)" << endl;
output << "%" << endl
<< "% Wrapper function automatically created by Dynare" << endl
<< "%" << endl << endl;
<< "%" << endl
<< endl
<< " if T_flag" << endl
<< " T = " << basename + "_" + ending + "_tt(T, y, x, params, steady_state, it_);" << endl
<< " end" << endl;
if (ending == "g1")
output << " T = " << basename + "_" + ending + "_tt(T, y, x, params, steady_state, it_);" << endl
<< " residual = " << basename + "_resid(T, y, x, params, steady_state, it_, false);" << endl
output << " residual = " << basename + "_resid(T, y, x, params, steady_state, it_, false);" << endl
<< " g1 = " << basename + "_g1(T, y, x, params, steady_state, it_, false);" << endl;
else if (ending == "g2")
output << " T = " << basename + "_" + ending + "_tt(T, y, x, params, steady_state, it_);" << endl
<< " [residual, g1] = " << basename + "_resid_g1(T, y, x, params, steady_state, it_, false);" << endl
output << " [residual, g1] = " << basename + "_resid_g1(T, y, x, params, steady_state, it_, false);" << endl
<< " g2 = " << basename + "_g2(T, y, x, params, steady_state, it_, false);" << endl;
else if (ending == "g3")
output << " T = " << basename + "_" + ending + "_tt(T, y, x, params, steady_state, it_);" << endl
<< " [residual, g1, g2] = " << basename + "_resid_g1_g2(T, y, x, params, steady_state, it_, false);" << endl
output << " [residual, g1, g2] = " << basename + "_resid_g1_g2(T, y, x, params, steady_state, it_, false);" << endl
<< " g3 = " << basename + "_g3(T, y, x, params, steady_state, it_, false);" << endl;
output << endl << "end" << endl;

27
src/StaticModel.cc
View File

@ -1186,30 +1186,31 @@ StaticModel::writeWrapperFunctions(const string &basename, const string &ending)
}
if (ending == "g1")
output << "function [residual, g1] = " << name << "(T, y, x, params)" << endl
<< "% function [residual, g1] = " << name << "(T, y, x, params)" << endl;
output << "function [residual, g1] = " << name << "(T, y, x, params, T_flag)" << endl
<< "% function [residual, g1] = " << name << "(T, y, x, params, T_flag)" << endl;
else if (ending == "g2")
output << "function [residual, g1, g2] = " << name << "(T, y, x, params)" << endl
<< "% function [residual, g1, g2] = " << name << "(T, y, x, params)" << endl;
output << "function [residual, g1, g2] = " << name << "(T, y, x, params, T_flag)" << endl
<< "% function [residual, g1, g2] = " << name << "(T, y, x, params, T_flag)" << endl;
else if (ending == "g3")
output << "function [residual, g1, g2, g3] = " << name << "(T, y, x, params)" << endl
<< "% function [residual, g1, g2, g3] = " << name << "(T, y, x, params)" << endl;
output << "function [residual, g1, g2, g3] = " << name << "(T, y, x, params, T_flag)" << endl
<< "% function [residual, g1, g2, g3] = " << name << "(T, y, x, params, T_flag)" << endl;
output << "%" << endl
<< "% Wrapper function automatically created by Dynare" << endl
<< "%" << endl << endl;
<< "%" << endl
<< endl
<< " if T_flag" << endl
<< " T = " << basename + "_" + ending + "_tt(T, y, x, params);" << endl
<< " end" << endl;
if (ending == "g1")
output << " T = " << basename + "_" + ending + "_tt(T, y, x, params);" << endl
<< " residual = " << basename + "_resid(T, y, x, params, false);" << endl
output << " residual = " << basename + "_resid(T, y, x, params, false);" << endl
<< " g1 = " << basename + "_g1(T, y, x, params, false);" << endl;
else if (ending == "g2")
output << " T = " << basename + "_" + ending + "_tt(T, y, x, params);" << endl
<< " [residual, g1] = " << basename + "_resid_g1(T, y, x, params, false);" << endl
output << " [residual, g1] = " << basename + "_resid_g1(T, y, x, params, false);" << endl
<< " g2 = " << basename + "_g2(T, y, x, params, false);" << endl;
else if (ending == "g3")
output << " T = " << basename + "_" + ending + "_tt(T, y, x, params);" << endl
<< " [residual, g1, g2] = " << basename + "_resid_g1_g2(T, y, x, params, false);" << endl
output << " [residual, g1, g2] = " << basename + "_resid_g1_g2(T, y, x, params, false);" << endl
<< " g3 = " << basename + "_g3(T, y, x, params, false);" << endl;
output << endl << "end" << endl;