Changeset 4638

Timestamp:

07/16/10 17:39:41 (15 years ago)

Author:

Eric.Larour

Message:

Added new FetchData overloads, for integer and float vectors

Location:

issm/trunk/src/c/io

Files:

• FetchData.cpp (modified) (1 diff)
• io.h (modified) (1 diff)

issm/trunk/src/c/io/FetchData.cpp

@@ -150 +150 @@
 }
 /*}}}*/
+/*FUNCTION FetchData(int** pvector,int* pM,const mxArray* dataref){{{1*/
+void FetchData(int** pvector,int* pM,const mxArray* dataref){
+
+        int    i;
+        double *doublevector   = NULL;
+        int    *outvector      = NULL;
+        int     outvector_rows;
+
+        if(mxIsEmpty(dataref)){
+                /*Nothing to pick up. Just initialize matrix pointer to NULL: */
+                outvector_rows=0;
+                outvector=NULL;
+        }
+        else if (mxIsDouble(dataref) ){
+
+                /*Convert matlab vector to double*  vector: */
+                MatlabVectorToDoubleVector(&doublevector,&outvector_rows,dataref);
+
+                /*Convert double vector into integer vector: */
+                outvector=(int*)xmalloc(outvector_rows*sizeof(int));
+                for(i=0;i<outvector_rows;i++)outvector[i]=(int)doublevector[i];
+        }
+        else{
+                /*This is an error: we don't have the correct input!: */
+                ISSMERROR("wrong input parameter");
+        }
+
+        /*Assign output pointers:*/
+        *pvector=outvector;
+        if (pM)*pM=outvector_rows;
+}
+/*}}}*/
+/*FUNCTION FetchData(float** pvector,int* pM,const mxArray* dataref){{{1*/
+void FetchData(float** pvector,int* pM,const mxArray* dataref){
+
+        int    i;
+        double *doublevector   = NULL;
+        float  *outvector      = NULL;
+        int     outvector_rows;
+
+        if(mxIsEmpty(dataref)){
+                /*Nothing to pick up. Just initialize matrix pointer to NULL: */
+                outvector_rows=0;
+                outvector=NULL;
+        }
+        else if (mxIsDouble(dataref) ){
+
+                /*Convert matlab vector to double*  vector: */
+                MatlabVectorToDoubleVector(&doublevector,&outvector_rows,dataref);
+
+                /*Convert double vector into float vector: */
+                outvector=(float*)xmalloc(outvector_rows*sizeof(float));
+                for(i=0;i<outvector_rows;i++)outvector[i]=(float)doublevector[i];
+        }
+        else{
+                /*This is an error: we don't have the correct input!: */
+                ISSMERROR("wrong input parameter");
+        }
+
+        /*Assign output pointers:*/
+        *pvector=outvector;
+        if (pM)*pM=outvector_rows;
+}
+/*}}}*/
 /*FUNCTION FetchData(Vec* pvector,const mxArray* dataref){{{1*/
 void FetchData(Vec* pvector,const mxArray* dataref){

issm/trunk/src/c/io/io.h

@@ -34 +34 @@
 void FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref);
 void FetchData(Mat* pmatrix,const mxArray* dataref);
+void FetchData(int** pvector,int* pM,const mxArray* dataref);
+void FetchData(float** pvector,int* pM,const mxArray* dataref);
 void FetchData(double** pvector,int* pM,const mxArray* dataref);
 void FetchData(Vec* pvector,const mxArray* dataref);