Changeset 1154 for trunk/packages/optimizer/src/rp_optimizer_tcl.c

Timestamp:

Sep 15, 2008, 6:54:01 AM (16 years ago)

Author:

liveletlive

Message:

tweaked the configuration code for number parameters.
added code required to include units of a number parameter.

File:

• trunk/packages/optimizer/src/rp_optimizer_tcl.c (modified) (4 diffs)

trunk/packages/optimizer/src/rp_optimizer_tcl.c

@@ -62 +62 @@
   {"-stddev",RP_OPTION_DOUBLE,Rp_Offset(RpOptimParamNumber,stddev)},
   {"-mean",RP_OPTION_DOUBLE,Rp_Offset(RpOptimParamNumber,mean)},
+  {"-units",RP_OPTION_STRING,Rp_Offset(RpOptimParamNumber,units)},
   {NULL, NULL, 0}
 };
@@ -767 +768 @@
     Tcl_Obj *dataPtr;
     Tcl_DString buffer;
+    RpOptimParamNumber *numPtr;
+    char dvalBuffer[50];
 
     /*
@@ -785 +788 @@
         switch (values[n].type) {
         case RP_OPTIMPARAM_NUMBER:
-            objv[2*n+3] = Tcl_NewDoubleObj(values[n].value.dval);
+                numPtr = (RpOptimParamNumber*)envPtr->paramList[n];
+                status = sprintf(dvalBuffer,"%lf%s",values[n].value.dval,numPtr->units);
+                if(status<0){
+                        panic("Could not convert number into number+units format");
+                }
+            objv[2*n+3] = Tcl_NewStringObj(dvalBuffer,-1);
             Tcl_IncrRefCount(objv[2*n+3]);
             break;
@@ -847 +855 @@
                 if (status != TCL_OK) {
                     result = RP_OPTIM_FAILURE;
-                    fprintf(stderr, "== UNEXPECTED ERROR while extracting output value:%s\n", Tcl_GetStringResult(interp));
+                    fprintf(stderr, "==UNEXPECTED ERROR while extracting output value:%s\n", Tcl_GetStringResult(interp));
                 } else if (Tcl_GetDoubleFromObj(interp,
                       Tcl_GetObjResult(interp), fitnessPtr) != TCL_OK) {
                     result = RP_OPTIM_FAILURE;
-                    fprintf(stderr, "== ERROR while extracting output value:%s\n", Tcl_GetStringResult(interp));
+                    fprintf(stderr, "==ERROR while extracting output value:%s\n", Tcl_GetStringResult(interp));
                 }
                 for (n=0; n < 3; n++) {