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

k-order DLL: finally adapt for M_.{endo,exo}_names as cell arrays

time-shift
Sébastien Villemot 2019-04-08 17:53:20 +02:00
parent 86a607a4fc
commit efa1f39e71
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
2 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
matlab/k_order_pert.m
View File

@ -22,11 +22,6 @@ info = 0;
M.var_order_endo_names = M.endo_names(dr.order_var);
% k_order_perturbation expects char array for the names of endogenous and
% exogenous variables (not cells). The mex needs to be fixed...
M.var_order_endo_names = char(M.var_order_endo_names);
M.exo_names = char(M.exo_names);
order = options.order;
if order>1 && options.loglinear

34
mex/sources/k_order_perturbation/k_order_perturbation.cc
View File

@ -46,21 +46,17 @@
) */
std::vector<std::string> g_fieldnames;
/* Convert MATLAB Dynare endo and exo names array to a vector<string> array of
string pointers. MATLAB “mx” function returns a long string concatenated by
columns rather than rows hence a rather low level approach is needed. */
void
DynareMxArrayToString(const mxArray *mxFldp, int len, int width, std::vector<std::string> &out)
/* Convert MATLAB Dynare endo and exo names cell array to a vector<string> array of
string pointers. */
std::vector<std::string>
DynareMxArrayToString(const mxArray *mxFldp)
{
char *cNamesCharStr = mxArrayToString(mxFldp);
assert(mxIsCell(mxFldp));
std::vector<std::string> r;
for (size_t i = 0; i < mxGetNumberOfElements(mxFldp); i++)
r.emplace_back(mxArrayToString(mxGetCell(mxFldp, i)));
out.resize(len);
for (int i = 0; i < width; i++)
for (int j = 0; j < len; j++)
// Allow alphanumeric and underscores "_" only:
if (std::isalnum(cNamesCharStr[j+i*len]) || (cNamesCharStr[j+i*len] == '_'))
out[j] += cNamesCharStr[j+i*len];
return r;
}
void
@ -165,18 +161,12 @@ extern "C" {
DYN_MEX_FUNC_ERR_MSG_TXT("The derivatives were not computed for the required order. Make sure that you used the right order option inside the 'stoch_simul' command");
mxFldp = mxGetField(M_, 0, "var_order_endo_names");
const int nendo = static_cast<int>(mxGetM(mxFldp));
const int widthEndo = static_cast<int>(mxGetN(mxFldp));
std::vector<std::string> endoNames;
DynareMxArrayToString(mxFldp, nendo, widthEndo, endoNames);
std::vector<std::string> endoNames = DynareMxArrayToString(mxFldp);
mxFldp = mxGetField(M_, 0, "exo_names");
const int nexo = static_cast<int>(mxGetM(mxFldp));
const int widthExog = static_cast<int>(mxGetN(mxFldp));
std::vector<std::string> exoNames;
DynareMxArrayToString(mxFldp, nexo, widthExog, exoNames);
std::vector<std::string> exoNames = DynareMxArrayToString(mxFldp);
if (nEndo != nendo || nExog != nexo)
if (nEndo != static_cast<int>(endoNames.size()) || nExog != static_cast<int>(exoNames.size()))
DYN_MEX_FUNC_ERR_MSG_TXT("Incorrect number of input parameters.");
std::unique_ptr<TwoDMatrix> g1m, g2m, g3m;