Changeset 899 for trunk/optimizer/src/rp_optimizer.c

Timestamp:

Feb 22, 2008, 2:08:40 PM (16 years ago)

Author:

mmc

Message:

Added a -fitness option to the "perform" operation. Right now, you can
specify just the name of an output quantity, and that quantity can be
minimized or maximized. In the future, there should be an expression
parser so you can enter any function of Rappture quantities.

Fixed up the example so that it runs the Rosenbrock function, which is
difficult to minimize. Added a visualize.tcl script, so you can visualize
the output from many different runXXXX.xml files.

File:

• trunk/optimizer/src/rp_optimizer.c (modified) (2 diffs)

trunk/optimizer/src/rp_optimizer.c

@@ -33 +33 @@
  */
 RpOptimEnv*
-RpOptimCreate(pluginData, cleanupProc)
-    ClientData pluginData;        /* special data created for this env */
-    RpOptimCleanup *cleanupProc;  /* routine to clean up pluginData */
+RpOptimCreate(pluginDefn)
+    RpOptimPlugin *pluginDefn;    /* plug-in handling this optimization */
 {
     RpOptimEnv *envPtr;
     envPtr = (RpOptimEnv*)malloc(sizeof(RpOptimEnv));
-    envPtr->pluginData  = pluginData;
-    envPtr->cleanupProc = cleanupProc;
-    envPtr->toolData    = NULL;
+
+    envPtr->pluginDefn = pluginDefn;
+    envPtr->pluginData = NULL;
+    envPtr->toolData   = NULL;
+
+    if (pluginDefn->initProc) {
+        envPtr->pluginData = (*pluginDefn->initProc)();
+    }
 
     envPtr->numParams = 0;
@@ -211 +215 @@
     int n;
 
+    if (envPtr->pluginDefn && envPtr->pluginDefn->cleanupProc) {
+        (*envPtr->pluginDefn->cleanupProc)(envPtr->pluginData);
+    }
     for (n=0; n < envPtr->numParams; n++) {
         RpOptimCleanupParam(envPtr->paramList[n]);
-    }
-    if (envPtr->cleanupProc) {
-        (*envPtr->cleanupProc)(envPtr->pluginData);
     }
     free(envPtr->paramList);