Changeset 7860 for issm/trunk/src/c/io/OptionParse.cpp

Timestamp:

04/12/11 15:37:07 (14 years ago)

Author:

jschierm

Message:

Added Option processing for Matlab n-dimensional doubles, logicals, and characters.

File:

• issm/trunk/src/c/io/OptionParse.cpp (modified) (6 diffs)

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

@@ -42 +42 @@
 
         OptionDouble *odouble = NULL;
-        const mwSize  *ipt     = NULL;
 
         /*check and parse the name  */
@@ -54 +53 @@
         }
 
-        odouble->numel=mxGetNumberOfElements(prhs[0]);
-        odouble->ndims=mxGetNumberOfDimensions(prhs[0]);
-        ipt           =mxGetDimensions(prhs[0]);
-        odouble->size =(int *) xmalloc(odouble->ndims*sizeof(int));
-        for (int i=0; i<odouble->ndims; i++) odouble->size[i]=(int)ipt[i];
-
-        //  note that FetchData does not correctly handle ndims >= 3
-        if (odouble->ndims > 2) {
-                _printf_(true,"WARNING -- option \"%s\" of class \"%s\" has ndims=%d and will be skipped.\n",odouble->name,mxGetClassName(prhs[0]),odouble->ndims);
-                odouble->numel=0;
-        }
-        else FetchData(&odouble->values,NULL,NULL,prhs[0]);
+        FetchData(&odouble->values,&odouble->numel,&odouble->ndims,&odouble->size,prhs[0]);
 
         return(odouble);
@@ -73 +61 @@
 
         OptionLogical *ological = NULL;
-        const mwSize   *ipt      = NULL;
-        bool            btemp;
 
         /*check and parse the name  */
@@ -86 +72 @@
         }
 
-        ological->numel=mxGetNumberOfElements(prhs[0]);
-        ological->ndims=mxGetNumberOfDimensions(prhs[0]);
-        ipt            =mxGetDimensions(prhs[0]);
-        ological->size =(int *) xmalloc(ological->ndims*sizeof(int));
-        for (int i=0; i<ological->ndims; i++) ological->size[i]=(int)ipt[i];
-
-        //  note that FetchData does not correctly handle non-scalar logicals
-        if (ological->ndims > 2 || ological->size[0] > 1 || ological->size[1] > 1) {
-                _printf_(true,"WARNING -- option \"%s\" of class \"%s\" is more than [1x1] and will be skipped.\n",ological->name,mxGetClassName(prhs[0]));
-                ological->numel=0;
-        }
-        else {
-                //FetchData(&ological->values,prhs[0]);
-                //could be memory leak until FetchData handles logical arrays
-                ological->values=(bool *) xmalloc(sizeof(bool));
-                FetchData(ological->values,prhs[0]);
-        }
+        FetchData(&ological->values,&ological->numel,&ological->ndims,&ological->size,prhs[0]);
 
         return(ological);
@@ -110 +80 @@
 
         OptionChar  *ochar = NULL;
-        const mwSize *ipt   = NULL;
 
         /*check and parse the name  */
@@ -122 +91 @@
         }
 
-        ochar->numel=mxGetNumberOfElements(prhs[0]);
-        ochar->ndims=mxGetNumberOfDimensions(prhs[0]);
-        ipt         =mxGetDimensions(prhs[0]);
-        ochar->size =(int *) xmalloc(ochar->ndims*sizeof(int));
-        for(int i=0; i<ochar->ndims; i++) ochar->size[i]=(int)ipt[i];
-
-        //note that FetchData does not correctly handle ndims >= 2 or multiple rows
-        if (ochar->ndims > 2 || ochar->size[0] > 1) {
-                _printf_(true,"WARNING -- option \"%s\" of class \"%s\" is more than [1xn] and will be skipped.\n",ochar->name,mxGetClassName(prhs[0]));
-                ochar->numel=0;
-        }
-        else FetchData(&ochar->values,prhs[0]);
+        FetchData(&ochar->values,&ochar->numel,&ochar->ndims,&ochar->size,prhs[0]);
 
         return(ochar);