Changeset 1154 for trunk/packages

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.

Location:

trunk/packages/optimizer/src

Files:

• plugin_pgapack.c (modified) (3 diffs)
• rp_optimizer.c (modified) (1 diff)
• rp_optimizer.h (modified) (1 diff)
• rp_optimizer_tcl.c (modified) (4 diffs)

trunk/packages/optimizer/src/plugin_pgapack.c

@@ -293 +293 @@
                 if(numPtr->randdist == RAND_NUMBER_DIST_UNIFORM){
                         dval = PGARandom01(ctx,0);
-                        newParamPtr[n].value.dval =
-                    (numPtr->max - numPtr->min)*dval + numPtr->min;
+                        newParamPtr[n].value.dval = (numPtr->max - numPtr->min)*dval + numPtr->min;
                 }else if(numPtr->randdist == RAND_NUMBER_DIST_GAUSSIAN){
                                 dval = PGARandomGaussian(ctx,numPtr->mean,numPtr->stddev);
@@ -892 +891 @@
 {
         int i;
-        printf("\nSetting sample value.......................\n");
+        //printf("\nSetting sample value.......................\n");
         if(chrom!=NULL && (&table)!=NULL){
                 (table.no_of_samples_evaled)+=1;
@@ -910 +909 @@
                                         if(i==0){
                                                 table.data[i][(table.no_of_samples_evaled)-1] = fitness;
-                                                printf("\nSample Number %d:- Fitness: %lf\t",table.no_of_samples_evaled,fitness);
+                                                //printf("\nSample Number %d:- Fitness: %lf\t",table.no_of_samples_evaled,fitness);
                                         }else{
                                                 table.data[i][(table.no_of_samples_evaled)-1] = chrom[i-1].value.dval;
-                                                printf("Param %d %lf\t",i,table.data[i][(table.no_of_samples_evaled)-1]);
+                                                //printf("Param %d %lf\t",i,table.data[i][(table.no_of_samples_evaled)-1]);
                                         }
                 }

trunk/packages/optimizer/src/rp_optimizer.c

@@ -118 +118 @@
     numPtr->stddev = 1; 
     numPtr->mean = 0;
-    numPtr->strictmax = 0; /*no strict truncation by default*/
-    numPtr->strictmax = 0; /*no strict maximum truncation by default*/
-
+    numPtr->strictmax = 0; /*no strictmax truncation by default*/
+    numPtr->strictmin = 0; /*no strict minimum truncation by default*/
+        numPtr->units = ""; /* Blank Units by default*/
     RpOptimAddParam(envPtr, (RpOptimParam*)numPtr);
 

trunk/packages/optimizer/src/rp_optimizer.h

@@ -112 +112 @@
     double stddev;                                      /* std deviaton for gaussian profile*/
     double mean;                                        /* mean for gaussian profile*/
+    char *units;
 } RpOptimParamNumber;
 

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++) {