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

Timestamp:

04/16/12 18:37:27 (13 years ago)

Author:

Eric.Larour

Message:

Some debugging of compilation

File:

• issm/trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp (modified) (2 diffs)

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

@@ -9 +9 @@
 #endif
 
+#include <mex.h>
 #include "../../shared/shared.h"
 #include "../../include/include.h"
-
-#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
-#include <mex.h>
-/*FUNCTION FetchData(DataSet** pdataset,const mxArray* dataref){{{1*/
-void FetchData(DataSet** pdataset,const mxArray* dataref){
-
-        /*output*/
-        DataSet* outdataset=NULL;
-        char*    outdataset_buffer=NULL;
-        int      outdataset_size;
-
-        /*First, check that our reference is a double, otherwise, error out: */
-        if (mxIsClass(dataref,"double")){
-                        
-                /*We need to copy the data pointed by dataref, so that our dataset is not actually a pointer!:*/
-                if (!mxIsEmpty(dataref)){
-                        outdataset_buffer=(char*)mxGetPr(dataref);
-                        outdataset_size=mxGetM(dataref)*mxGetN(dataref);
-                        if(outdataset_size)outdataset=DataSetDemarshall(outdataset_buffer);
-                }
-        }
-        else{
-                if (mxIsEmpty(dataref)){
-                        /*Nothing to pick up. Just initialize pointer to NULL, and warn the server we are not uploading anything: */
-                        outdataset_size=0;
-                        outdataset=NULL;
-                }
-                else{
-                        /*This is an error: we don't have the correct input!: */
-                        _error_("Input parameter of class %s not supported yet",mxGetClassName(dataref));
-                }
-        }
-
-        /*Assign output pointers:*/
-        *pdataset=outdataset;
-}
-/*}}}*/
+#include "./matlabio.h"
+
 /*FUNCTION FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref){{{1*/
 void FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref){
@@ -560 +526 @@
 }
 /*}}}*/
-/*FUNCTION FetchData(Parameters** pparameters, DataHandle dataref){{{1*/
-void FetchData(Parameters** pparameters, DataHandle dataref){
-
-        int i,j;
-        int count;
-
-        /*output: */
-        Param* param=NULL;
-        Parameters* parameters=NULL;
-
-        /*intermediary: */
-        int M,N;
-        double* tmatrix=NULL;
-        double* matrix=NULL;
-        char**  stringarray=NULL;
-        double** array=NULL;
-        int*     mdims_array=NULL;
-        int*     ndims_array=NULL;
-        int nfields;
-        char* name=NULL;
-        mxArray* pfield=NULL;
-        mxArray* pfield2=NULL;
-        int enum_type;
-
-
-        /*First, create parameters : */
-        parameters=new Parameters();
-
-        /*go through matlab params structure, and create Param object for each field: */
-
-        nfields=mxGetNumberOfFields(dataref);
-
-        for(count=0;count<nfields;count++){
-
-                /*Get i'th field: */
-                name=(char*)mxGetFieldNameByNumber(dataref,count);
-                enum_type=StringToEnumx(name);
-                pfield=mxGetFieldByNumber(dataref,0,count);
-                _assert_(pfield);
-                
-                /*Check type of field: */
-                if (mxIsClass(pfield,"double")){
-                        
-                        M=mxGetM(pfield);
-                        N=mxGetN(pfield);
-
-                        if (M==0 | N==0){
-                                _error_("array in parameters structure field %s is of size 0",name);
-                        }
-                        if (M==1 && N==1){
-                                /*we have a simple scalar: */
-                                param= new DoubleParam(enum_type,*mxGetPr(pfield));
-                                parameters->AddObject(param);
-
-                        }
-                        else{
-                                if (N==1){
-                                        
-                                        /*vector: */
-                                        param= new DoubleVecParam(enum_type,mxGetPr(pfield),M);
-                                        parameters->AddObject(param);
-
-                                }
-                                else{
-                                        /*matrix: first, transpose, then plug into Param */
-                                        matrix=mxGetPr(pfield);
-                                        tmatrix=(double*)xmalloc(M*N*sizeof(double));
-                                        for (i=0;i<M;i++){
-                                                for(j=0;j<N;j++){
-                                                        *(tmatrix+N*i+j)=*(matrix+M*j+i);
-                                                }
-                                        }
-
-                                        param= new DoubleMatParam(enum_type,tmatrix,M,N);
-                                        parameters->AddObject(param);
-        
-                                        /*Free ressources:*/
-                                        xfree((void**)&tmatrix);
-                                }
-                        }
-
-                }
-                else if (mxIsClass(pfield,"logical")){
-
-                        M=mxGetM(pfield);
-                        N=mxGetN(pfield);
-
-                        if (M==0 | N==0){
-                                _error_("array in parameters structure field %s is of size 0",name);
-                        }
-                        if (M==1 && N==1){
-                                /*we have a simple bool: */
-                                param= new BoolParam(enum_type,*mxGetLogicals(pfield));
-                                parameters->AddObject(param);
-
-                        }
-                        else{
-                                _error_("Matrices of Booleans not supported yet in parameters");
-                        }
-                }
-                else if (mxIsClass(pfield,"char")){
-                        /* we have a string parameter:*/
-                        
-                        int stringlen;
-                        char* string=NULL;
-                        
-                        stringlen = mxGetM(pfield)*mxGetN(pfield)+1;
-                        string = (char*)xmalloc(sizeof(mxChar)*stringlen);
-                        mxGetString(pfield,string,stringlen);
-
-                        param= new StringParam(enum_type,string);
-                        parameters->AddObject(param);
-
-                        xfree((void**)&string);
-                }
-                else if (mxIsClass(pfield,"cell")){
-
-                        /*This can be a string array, or a matrix array. Check the first 
-                         *element type to decide: */
-                        pfield2=mxGetCell(pfield,0);
-                        if (mxIsClass(pfield2,"char")){
-                                
-                                /*string array: */
-                                M=mxGetM(pfield);
-                                stringarray=(char**)xmalloc(M*sizeof(char*));
-
-                                for(i=0;i<M;i++){
-                                        char* descriptor=NULL;
-                                        pfield2=mxGetCell(pfield,i);
-                                        FetchData(&descriptor,pfield2);
-                                        stringarray[i]=descriptor;
-                                }
-
-                                param= new StringArrayParam(enum_type,stringarray,M);
-                                parameters->AddObject(param);
-
-                                /*Free ressources:*/
-                                for(i=0;i<M;i++){
-                                        char* descriptor=stringarray[i];
-                                        xfree((void**)&descriptor);
-                                }
-                                xfree((void**)&stringarray);
-
-                        }
-                        else{
-                                
-                                /*matrix array: */
-                                M=mxGetM(pfield);
-                                array=(double**)xmalloc(M*sizeof(double*));
-                                mdims_array=(int*)xmalloc(M*sizeof(int));
-                                ndims_array=(int*)xmalloc(M*sizeof(int));
-
-                                for(i=0;i<M;i++){
-                                        double* matrix=NULL;
-                                        int     m,n;
-                                        pfield2=mxGetCell(pfield,i);
-                                        FetchData(&matrix,&m,&n,pfield2);
-                                        array[i]=matrix;
-                                        mdims_array[i]=m;
-                                        ndims_array[i]=n;
-                                }
-
-                                param= new DoubleMatArrayParam(enum_type,array,M,mdims_array,ndims_array);
-                                parameters->AddObject(param);
-
-                                /*Free ressources:*/
-                                for(i=0;i<M;i++){
-                                        double* matrix=array[i];
-                                        xfree((void**)&matrix);
-                                }
-                                xfree((void**)&array);
-                                xfree((void**)&mdims_array);
-                                xfree((void**)&ndims_array);
-                        }
-                }
-                else _error_("Parameters structure field %s has a format that is not supported: %s",name,mxGetClassName(pfield));
-        }
-
-        /*Assign output pointers:*/
-        *pparameters=parameters;
-}
-/*}}}*/
-#endif