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

Timestamp:

Jun 24, 2008, 6:13:41 PM (16 years ago)

Author:

liveletlive

Message:

Committing changes related to command <name> samples ?number?

File:

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

trunk/packages/optimizer/src/rp_optimizer_tcl.c

@@ -71 +71 @@
 
 extern int pgapack_abort;
+extern void PGARuntimeDataTableInit();
+extern void PGARuntimeDataTableDeInit();
+extern void GetSampleInformation();
 
 int
@@ -224 +227 @@
     toolDataPtr->updateCmdPtr = NULL;
     envPtr->toolData = (ClientData)toolDataPtr;
-
     Tcl_CreateObjCommand(interp, name, RpOptimInstanceCmd,
         (ClientData)envPtr, (Tcl_CmdDeleteProc*)RpOptimCmdDelete);
-
     Tcl_SetResult(interp, name, TCL_VOLATILE);
     return TCL_OK;
@@ -250 +251 @@
     ClientData paramdata;
 
+    PGARuntimeDataTableDeInit();/*Free space allocated to data table here*/
     if (envPtr->toolData) {
         toolDataPtr = (RpOptimToolData*)envPtr->toolData;
@@ -290 +292 @@
  *                     ?-updatecommand <varName>?
  *      <name> using
+ *      <name> samples ?number?
  *
  *  The "add" command is used to add various parameter types to the
  *  optimizer context.  The "perform" command kicks off an optimization
- *  run.
+ *  run. The "samples" command displays sample info during an optimization run.
  * ------------------------------------------------------------------------
  */
@@ -313 +316 @@
     RpTclOption *optSpecPtr;
     Tcl_Obj *rval, *rrval, *toolPtr, *updateCmdPtr;
-
+    
     if (objc < 2) {
         Tcl_WrongNumArgs(interp, 1, objv, "option ?args...?");
@@ -580 +583 @@
         /* no -updatecommand by default */
         updateCmdPtr = NULL;
-
+                
+                PGARuntimeDataTableInit(envPtr);/*Initialize Data table here....*/
+                
         n = 2;
         while (n < objc) {
@@ -632 +637 @@
             toolDataPtr->updateCmdPtr = updateCmdPtr;
         }
-
+                
         /* call the main optimization routine here */
         status = (*envPtr->pluginDefn->runProc)(envPtr,
             RpOptimizerPerformInTcl, fitnessExpr);
-
-        fprintf(stderr, ">>>status=%d\n", status);
+                
+                fprintf(stderr, ">>>status=%d\n", status);
 
         Tcl_DecrRefCount(toolPtr);
@@ -682 +687 @@
         return TCL_OK;
     }
+    
+    else if(*option == 's' && strcmp(option,"samples") == 0){
+        int sampleNumber = -1; /*initing sampnum to -1, use it when no sample number is specified*/
+        char *sampleDataBuffer;
+        if(objc>3){
+                Tcl_WrongNumArgs(interp, 2, objv, "?sampleNumber?");
+            return TCL_ERROR;
+        }
+        
+        if(objc == 3){
+                if(Tcl_GetIntFromObj(interp,objv[2],&sampleNumber) != TCL_OK){
+                        return TCL_ERROR; 
+                }
+                sampleDataBuffer = malloc(sizeof(char)*SINGLE_SAMPLE_DATA_BUFFER_DEFAULT_SIZE);
+        }else{
+                sampleDataBuffer = malloc(sizeof(char)*50);
+        }
+        
+        if(sampleDataBuffer == NULL){
+                panic("Error: Could not allocate memory for sample data buffer.");
+        }
+        GetSampleInformation(sampleDataBuffer,sampleNumber);
+                fprintf(stdout,sampleDataBuffer);/**TODO GTG check if this should be fprintf or something else*/
+                free(sampleDataBuffer);
+        return TCL_OK;
+        
+    }
 
     else {
         Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
             "bad option \"", option, "\": should be add, configure, "
-            "get, perform, using", (char*)NULL);
+            "get, perform, using, samples", (char*)NULL);
         return TCL_ERROR;
     }