Changeset 22000 for issm/trunk-jpl/src/wrappers

Timestamp:

08/24/17 14:29:30 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying options: do not allow for cells and structs

Location:

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

Files:

• FetchMatlabData.cpp (modified) (2 diffs)
• matlabio.h (modified) (1 diff)

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

@@ -1093 +1093 @@
         return(ochar);
 }/*}}}*/
-GenericOption<Options**>* OptionStructParse( char* name, const mxArray* prhs[]){ /*{{{*/
-
-        int            i;
-        char           namei[161];
-        Option*                   option      = NULL;
-        GenericOption<Options**>  *ostruct    = NULL;
-        const mwSize  *ipt        = NULL;
-        const mxArray *structi;
-        mwIndex        sindex;
-
-        /*check and parse the name  */
-        ostruct=new GenericOption<Options**>();
-        ostruct->name =xNew<char>(strlen(name)+1);
-        memcpy(ostruct->name,name,(strlen(name)+1)*sizeof(char));
-
-        /*check and parse the value  */
-        if (!mxIsClass(prhs[0],"struct")){
-                _error_("Value of option \"" << ostruct->name  << "\" must be class \"struct\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
-        }
-        ostruct->numel=mxGetNumberOfElements(prhs[0]);
-        ostruct->ndims=mxGetNumberOfDimensions(prhs[0]);
-        ipt           =mxGetDimensions(prhs[0]);
-        ostruct->size =xNew<int>(ostruct->ndims);
-        for (i=0; i<ostruct->ndims; i++) ostruct->size[i]=(int)ipt[i];
-        if (ostruct->numel) ostruct->value=xNew<Options*>(ostruct->numel);
-
-        /*loop through and process each element of the struct array  */
-        for (sindex=0; sindex<ostruct->numel; sindex++) {
-                ostruct->value[sindex]=new Options;
-
-                /*loop through and process each field for the element  */
-                for (i=0; i<mxGetNumberOfFields(prhs[0]); i++) {
-                        sprintf(namei,"%s.%s",name,mxGetFieldNameByNumber(prhs[0],i));
-                        structi=mxGetFieldByNumber(prhs[0],sindex,i);
-
-                        option=(Option*)OptionParse(namei,&structi);
-                        ostruct->value[sindex]->AddObject((Object*)option);
-                        option=NULL;
-                }
-        }
-
-        return(ostruct);
-}/*}}}*/
-GenericOption<Options*>* OptionCellParse( char* name, const mxArray* prhs[]){ /*{{{*/
-
-        int            i;
-        int           *dims;
-        char           namei[161];
-        char           cstr[81];
-        GenericOption<Options*> *ocell      = NULL;
-        Option        *option     = NULL;
-        const mwSize  *ipt        = NULL;
-        const mxArray *celli;
-        mwIndex        cindex;
-
-        /*check and parse the name  */
-        ocell=new GenericOption<Options*>();
-        ocell->name =xNew<char>(strlen(name)+1);
-        memcpy(ocell->name,name,(strlen(name)+1)*sizeof(char));
-
-        /*check and parse the value  */
-        if (!mxIsClass(prhs[0],"cell")){
-                _error_("Value of option \"" << ocell->name  << "\" must be class \"cell\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
-        }
-
-        ocell->numel=mxGetNumberOfElements(prhs[0]);
-        ocell->ndims=mxGetNumberOfDimensions(prhs[0]);
-        ipt         =mxGetDimensions(prhs[0]);
-        ocell->size =xNew<int>(ocell->ndims);
-        for (i=0; i<ocell->ndims; i++) ocell->size[i]=(int)ipt[i];
-        ocell->value=new Options;
-
-        /*loop through and process each element of the cell array  */
-        dims=xNew<int>(ocell->ndims);
-        for (cindex=0; cindex<ocell->numel; cindex++) {
-                ColumnWiseDimsFromIndex(dims,(int)cindex,ocell->size,ocell->ndims);
-                StringFromDims(cstr,dims,ocell->ndims);
-                #ifdef _INTEL_WIN_
-                        _snprintf(namei,161,"%s%s",name,cstr);
-                #else
-                        snprintf(namei,161,"%s%s",name,cstr);
-                #endif
-                celli=mxGetCell(prhs[0],cindex);
-
-                option=(Option*)OptionParse(namei,&celli);
-                ocell->value->AddObject((Object*)option);
-                option=NULL;
-        }
-        xDelete<int>(dims);
-
-        return(ocell);
-}/*}}}*/
 Option* OptionParse(char* name, const mxArray* prhs[]){ /*{{{*/
 
@@ -1199 +1107 @@
         else if(mxIsClass(prhs[0],"char"))
          option=(Option*)OptionCharParse(name,prhs);
-        else if(mxIsClass(prhs[0],"struct"))
-         option=(Option*)OptionStructParse(name,prhs);
-        else if(mxIsClass(prhs[0],"cell"))
-         option=(Option*)OptionCellParse(name,prhs);
         else {
-                _printf0_("  Converting value of option \"" << name << "\" from unrecognized class \"" << mxGetClassName(prhs[0]) << "\" to class \"" << "struct" << "\".\n");
-                if (!mexCallMATLAB(1,lhs,1,(mxArray**)prhs,"struct")) {
-                        option=(Option*)OptionStructParse(name,(const mxArray**)lhs);
-                        mxDestroyArray(lhs[0]);
-                }
-                else _error_("Second argument value of option \""<< name <<"\" is of unrecognized class \""<< mxGetClassName(prhs[0]) <<"\".");
+                _error_("Second argument value of option \""<< name <<"\" is of unrecognized class \""<< mxGetClassName(prhs[0]) <<"\".");
         }
 

issm/trunk-jpl/src/wrappers/matlab/io/matlabio.h

@@ -59 +59 @@
 GenericOption<bool*>*     OptionLogicalParse( char* name, const mxArray* prhs[]);
 GenericOption<char*>*     OptionCharParse( char* name, const mxArray* prhs[]);
-GenericOption<Options**>* OptionStructParse( char* name, const mxArray* prhs[]);
-GenericOption<Options*>*  OptionCellParse( char* name, const mxArray* prhs[]);
 
 mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, const char* field);