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

Timestamp:

Feb 22, 2008, 2:08:40 PM (17 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.h (modified) (4 diffs)

trunk/optimizer/src/rp_optimizer.h

@@ -23 +23 @@
 #include <string.h>
 #include <malloc.h>
+#include "rp_tcloptions.h"
 
 /*
@@ -48 +49 @@
 
 typedef RpOptimStatus (RpOptimHandler) _ANSI_ARGS_((
-    struct RpOptimEnv *envPtr, RpOptimEvaluator *evalProc));
+    struct RpOptimEnv *envPtr, RpOptimEvaluator *evalProc,
+    char *fitnessExpr));
+
+/*
+ * Each optimization package is plugged in to this infrastructure
+ * by defining the following data at the top of rp_optimizer_tcl.c
+ */
+typedef struct RpOptimPlugin {
+    char *name;                   /* name of this package for -using */
+    RpOptimInit *initProc;        /* initialization routine */
+    RpOptimHandler *runProc;      /* handles the core optimization */
+    RpOptimCleanup *cleanupProc;  /* cleanup routine */
+    RpTclOption *optionSpec;      /* specs for config options */
+} RpOptimPlugin;
 
 /*
@@ -98 +112 @@
  */
 typedef struct RpOptimEnv {
+    RpOptimPlugin *pluginDefn;      /* plug-in handling this optimization */
+    ClientData pluginData;          /* data created by plugin init routine */
     RpOptimEvaluator *evalProc;     /* called during optimization to do run */
-    ClientData pluginData;          /* data created by plugin init routine */
-    RpOptimCleanup *cleanupProc;    /* cleanup routine for pluginData */
+    char *fitnessExpr;              /* fitness function in string form */
     ClientData toolData;            /* data used during tool execution */
     RpOptimParam **paramList;       /* list of input parameters to vary */
@@ -110 +125 @@
  *  Here are the functions in the API:
  */
-EXTERN RpOptimEnv* RpOptimCreate _ANSI_ARGS_((ClientData pluginData,
-    RpOptimCleanup *cleanupProc));
+EXTERN RpOptimEnv* RpOptimCreate _ANSI_ARGS_((RpOptimPlugin *pluginDefn));
 
 EXTERN RpOptimParam* RpOptimAddParamNumber _ANSI_ARGS_((RpOptimEnv *envPtr,