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

Dynare++: compatibility fixes with MatIO 1.5

time-shift
Sébastien Villemot 2012-09-11 15:22:29 +02:00
parent cecb375be4
commit 8789151c73
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dynare++/kord/dynamic_model.cweb
View File

@ -39,13 +39,19 @@ void NameList::writeMat(mat_t* fd, const char* vname) const
else else
m[j*getNum()+i] = ' '; m[j*getNum()+i] = ' ';
# if MATIO_MAJOR_VERSION > 1 || (MATIO_MAJOR_VERSION == 1 && MATIO_MINOR_VERSION >= 5)
size_t dims[2];
const matio_compression compression = MAT_COMPRESSION_NONE;
# else
int dims[2]; int dims[2];
const int compression = COMPRESSION_NONE;
# endif
dims[0] = getNum(); dims[0] = getNum();
dims[1] = maxlen; dims[1] = maxlen;
matvar_t *v = Mat_VarCreate(vname, MAT_C_CHAR, MAT_T_UINT8, 2, dims, m, 0); matvar_t *v = Mat_VarCreate(vname, MAT_C_CHAR, MAT_T_UINT8, 2, dims, m, 0);
Mat_VarWrite(fd, v, COMPRESSION_NONE); Mat_VarWrite(fd, v, compression);
Mat_VarFree(v); Mat_VarFree(v);
delete[] m; delete[] m;

8
dynare++/tl/cc/twod_matrix.cweb
View File

@ -34,7 +34,13 @@ ConstTwoDMatrix::ConstTwoDMatrix(int first_row, int num, const ConstTwoDMatrix&
@<|ConstTwoDMatrix::writeMat| code@>= @<|ConstTwoDMatrix::writeMat| code@>=
void ConstTwoDMatrix::writeMat(mat_t* fd, const char* vname) const void ConstTwoDMatrix::writeMat(mat_t* fd, const char* vname) const
{ {
#if MATIO_MAJOR_VERSION > 1 || (MATIO_MAJOR_VERSION == 1 && MATIO_MINOR_VERSION >= 5)
size_t dims[2];
const matio_compression compression = MAT_COMPRESSION_NONE;
#else
int dims[2]; int dims[2];
const int compression = COMPRESSION_NONE;
#endif
dims[0] = nrows(); dims[0] = nrows();
dims[1] = ncols(); dims[1] = ncols();
double *data = new double[nrows()*ncols()]; double *data = new double[nrows()*ncols()];
@ -45,7 +51,7 @@ void ConstTwoDMatrix::writeMat(mat_t* fd, const char* vname) const
matvar_t *v = Mat_VarCreate(vname, MAT_C_DOUBLE, MAT_T_DOUBLE, 2, dims, data, 0); matvar_t *v = Mat_VarCreate(vname, MAT_C_DOUBLE, MAT_T_DOUBLE, 2, dims, data, 0);
Mat_VarWrite(fd, v, COMPRESSION_NONE); Mat_VarWrite(fd, v, compression);
Mat_VarFree(v); Mat_VarFree(v);
delete[] data; delete[] data;