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

fixed bug in argument number check and removed unused variable

time-shift
Houtan Bastani 2010-12-14 18:42:29 +01:00
parent e7843e349a
commit b63590712c
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
matlab/k_order_pert.m
View File

@ -26,19 +26,19 @@ order = options.order;
switch(order) switch(order)
case 1 case 1
[err, g_1] = k_order_perturbation(dr,M,options, oo , ['.' ... [err, g_1] = k_order_perturbation(dr,M,options, ['.' ...
mexext]); mexext]);
mexErrCheck('k_order_perturbation', err); mexErrCheck('k_order_perturbation', err);
dr.g_1 = g_1; dr.g_1 = g_1;
case 2 case 2
[err, g_0, g_1, g_2] = k_order_perturbation(dr,M,options, oo , ['.' ... [err, g_0, g_1, g_2] = k_order_perturbation(dr,M,options, ['.' ...
mexext]); mexext]);
mexErrCheck('k_order_perturbation', err); mexErrCheck('k_order_perturbation', err);
dr.g_0 = g_0; dr.g_0 = g_0;
dr.g_1 = g_1; dr.g_1 = g_1;
dr.g_2 = g_2; dr.g_2 = g_2;
case 3 case 3
[err, g_0, g_1, g_2, g_3] = k_order_perturbation(dr,M,options, oo , ['.' ... [err, g_0, g_1, g_2, g_3] = k_order_perturbation(dr,M,options, ['.' ...
mexext]); mexext]);
mexErrCheck('k_order_perturbation', err); mexErrCheck('k_order_perturbation', err);
dr.g_0 = g_0; dr.g_0 = g_0;

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

@ -70,20 +70,19 @@ extern "C" {
mexFunction(int nlhs, mxArray *plhs[], mexFunction(int nlhs, mxArray *plhs[],
int nrhs, const mxArray *prhs[]) int nrhs, const mxArray *prhs[])
{ {
if (nrhs < 5 || nlhs < 2) if (nrhs != 4 || nlhs < 2)
DYN_MEX_FUNC_ERR_MSG_TXT("Must have exactly 5 input parameters and take at least 2 output parameters."); DYN_MEX_FUNC_ERR_MSG_TXT("Must have exactly 4 input parameters and take at least 2 output parameters.");
const mxArray *dr = prhs[0]; const mxArray *dr = prhs[0];
const mxArray *M_ = prhs[1]; const mxArray *M_ = prhs[1];
const mxArray *options_ = prhs[2]; const mxArray *options_ = prhs[2];
const mxArray *oo_ = prhs[3];
mxArray *mFname = mxGetField(M_, 0, "fname"); mxArray *mFname = mxGetField(M_, 0, "fname");
if (!mxIsChar(mFname)) if (!mxIsChar(mFname))
DYN_MEX_FUNC_ERR_MSG_TXT("Input must be of type char."); DYN_MEX_FUNC_ERR_MSG_TXT("Input must be of type char.");
string fName = mxArrayToString(mFname); string fName = mxArrayToString(mFname);
const mxArray *mexExt = prhs[4]; const mxArray *mexExt = prhs[3];
string dfExt = mxArrayToString(mexExt); // Dynamic file extension, e.g. ".dll" or ".mexw32" string dfExt = mxArrayToString(mexExt); // Dynamic file extension, e.g. ".dll" or ".mexw32"
int kOrder; int kOrder;