Changeset 12397

Timestamp:

06/09/12 17:29:22 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added support for matlab int16 data

Location:

issm/trunk-jpl/src/c/matlab/io

Files:

• FetchMatlabData.cpp (modified) (2 diffs)
• MatlabMatrixToDoubleMatrix.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp

@@ -27 +27 @@
                 outmatrix=NULL;
         }
-        else if(mxIsClass(dataref,"double") || mxIsClass(dataref,"single")){
+        else if(mxIsClass(dataref,"double") || mxIsClass(dataref,"single") || mxIsClass(dataref,"int16")){
                 /*Check dataref is not pointing to NaN: */
                 if ( mxIsNaN(*(mxGetPr(dataref))) && (mxGetM(dataref)==1) && (mxGetN(dataref)==1) ){
@@ -35 +35 @@
                 }
                 else{
+                        if(!mxIsClass(dataref,"double") && !mxIsClass(dataref,"single")){
+                                printf("Warning: converting matlab data from '%s' to 'double'\n",mxGetClassName(dataref));
+                        }
                         /*Convert matlab matrix to double* matrix: */
                         MatlabMatrixToDoubleMatrix(&outmatrix,&outmatrix_rows,&outmatrix_cols,dataref);

issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToDoubleMatrix.cpp

@@ -18 +18 @@
 int MatlabMatrixToDoubleMatrix(double** pmatrix,int* pmatrix_rows,int* pmatrix_cols,const mxArray* mxmatrix){
 
-        int     i,j,count,rows,cols;
-        double *pmxdoublematrix = NULL;
-        float  *pmxsinglematrix = NULL;
+        int        i,j,count,rows,cols;
+        double    *pmxdoublematrix = NULL;
+        float     *pmxsinglematrix = NULL;
+        short int *pmxint16matrix  = NULL;
 
         /*output: */
@@ -89 +90 @@
                 }
         }
+        else if(mxIsClass(mxmatrix,"int16")){
+                /*Dealing with dense matrix: recover pointer and size: */
+                pmxint16matrix=(short*)mxGetPr(mxmatrix);
+                rows=mxGetM(mxmatrix);
+                cols=mxGetN(mxmatrix);
+
+                /*Create serial matrix: */
+                if(rows*cols){
+                        matrix=(double*)xcalloc(rows*cols,sizeof(double));
+
+                        for(i=0;i<rows;i++){
+                                for(j=0;j<cols;j++){
+                                        matrix[cols*i+j]=(double)pmxint16matrix[rows*j+i];
+                                }
+                        }
+                }
+        }
         else{
                 _error_("Matlab matrix type Not implemented yet");