Changeset 986

Timestamp:

Apr 2, 2008, 2:32:58 PM (16 years ago)

Author:

gah

Message:

added global pgapack_abort flag to plugin and abort operation to optimizer

Location:

trunk/optimizer/src

Files:

• Makefile.in (modified) (1 diff)
• pgapack/pgapack/examples/c/classic (modified) (previous)
• pgapack/pgapack/examples/c/dejong (modified) (previous)
• pgapack/pgapack/examples/c/example (modified) (previous)
• pgapack/pgapack/examples/c/maxbit (modified) (previous)
• pgapack/pgapack/examples/c/maxchar (modified) (previous)
• pgapack/pgapack/examples/c/maxint (modified) (previous)
• pgapack/pgapack/examples/c/name (modified) (previous)
• pgapack/pgapack/examples/c/namefull (modified) (previous)
• pgapack/pgapack/examples/c/udtstr (modified) (previous)
• pgapack/pgapack/source/parallel.c (modified) (4 diffs)
• pgapack/pgapack/source/pga.c (modified) (2 diffs)
• pgapack/pgapack/source/stop.c (modified) (2 diffs)
• pgapack/pgapack/test/instverf (modified) (previous)
• plugin_pgapack.c (modified) (4 diffs)
• rp_optimizer_tcl.c (modified) (6 diffs)

trunk/optimizer/src/Makefile.in

@@ -1 @@
-e Makefile.in --
+# Makefile.in --
 #
 #       This file is a Makefile for Sample TEA Extension.  If it has the name

trunk/optimizer/src/pgapack/pgapack/source/parallel.c

@@ -69 +69 @@
 
 #include "pgapack.h"
+#include <setjmp.h>
+
+extern jmp_buf pgapack_jmpbuf;
+extern int *pgapack_abortPtr;
 
 #define DEBUG_EVAL 0
@@ -111 +115 @@
 
     PGAEvaluate(ctx, PGA_OLDPOP, f, comm);
+        
     if (rank == 0)
         PGAFitness(ctx, PGA_OLDPOP);
@@ -192 +197 @@
                 PGASetEvaluation (ctx, p-1, pop, e);
             }
-    } else {
-        for (p=0; p<ctx->ga.PopSize; p++) 
+    } else { 
+        for (p=0; p<ctx->ga.PopSize; p++) {
+            if ((pgapack_abortPtr != NULL) && (*pgapack_abortPtr == 1)) {
+                longjmp(pgapack_jmpbuf, 1);
+            }
             if (!PGAGetEvaluationUpToDateFlag(ctx, p, pop)) {
                 e = (*f)(ctx, p, pop);
                 PGASetEvaluation(ctx, p, pop, e);
-            }
+            } 
+        }
     }
     PGADebugExited("PGAEvaluateSeq");
@@ -485 +494 @@
         PGAEvaluateSlave(ctx, pop, f, comm);
     }
-
     PGADebugExited("PGAEvaluate");
 }

trunk/optimizer/src/pgapack/pgapack/source/pga.c

@@ -71 +71 @@
 
 #include "pgapack.h"
+#include <setjmp.h>
+
+jmp_buf pgapack_jmpbuf;
 
 /*U****************************************************************************
@@ -112 +115 @@
      ndemes = PGAGetNumDemes    (ctx);
 
+    if (setjmp(pgapack_jmpbuf)) {
+        return;                 /* PGA pack was aborted. */
+    }
      /**********************************************************************/
      /*              Global model, one island, one deme                    */
      /**********************************************************************/
-     if     ( (npops == 1) && (ndemes == 1) ) {
-
+     if ( (npops == 1) && (ndemes == 1) ) {
          PGARunGM(ctx, evaluate, comm);
      }

trunk/optimizer/src/pgapack/pgapack/source/stop.c

@@ -71 +71 @@
 
 #include "pgapack.h"
+
+int *pgapack_abortPtr = NULL;
 
 /*U****************************************************************************
@@ -377 +379 @@
     PGADebugExited("PGASetMaxSimilarityValue");
 }
+
+void PGASetAbortVar(int *abortPtr)
+{
+    pgapack_abortPtr = abortPtr;
+}

trunk/optimizer/src/plugin_pgapack.c

@@ -79 +79 @@
     dataPtr->popRepl = PGA_POPREPL_BEST;
     dataPtr->popSize = 200;
-
     return (ClientData)dataPtr;
 }
+
+int pgapack_abort = 0;
 
 /*
@@ -103 +104 @@
     /* fake it here by just saying something like "rappture" */
     int argc = 1; char *argv[] = {"rappture"};
+
+    pgapack_abort = 0;          /* FALSE */
+    PGASetAbortVar(&pgapack_abort);
 
     ctx = PGACreate(&argc, argv, PGA_DATATYPE_USER, envPtr->numParams,
@@ -143 +147 @@
     PgapUnlinkContext2Env(ctx);
 
+    if (pgapack_abort) {
+        return RP_OPTIM_ABORTED;
+    }
     return RP_OPTIM_SUCCESS;
 }
@@ -172 +179 @@
     status = (*envPtr->evalProc)(envPtr, paramPtr, envPtr->numParams, &fit);
 
+    if (pgapack_abort) {
+        fprintf(stderr, "==WARNING: run aborted!");
+        return 0.0;
+    }
+        
     if (status != RP_OPTIM_SUCCESS) {
         fprintf(stderr, "==WARNING: run failed!");

trunk/optimizer/src/rp_optimizer_tcl.c

@@ -15 +15 @@
  */
 #include "rp_optimizer.h"
+
+extern int pgapack_abort;
 
 /*
@@ -67 +69 @@
 __declspec( dllexport )
 #endif
+
+extern int pgapack_abort;
 
 int
@@ -362 +366 @@
             return TCL_ERROR;
         }
-    }
-
-    /*
-     * OPTION:  get ?globPattern? ?-option?
-     */
-    else if (*option == 'g' && strcmp(option,"get") == 0) {
+    } else if (*option == 'a' && strcmp(option,"abort") == 0) {
+        int value;
+
+        if (objc < 3) {
+            Tcl_WrongNumArgs(interp, 1, objv, "abort bool");
+            return TCL_ERROR;
+        }
+        if (Tcl_GetBooleanFromObj(interp, objv[2], &value) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        pgapack_abort = value;
+        return TCL_OK;
+    } else if (*option == 'g' && strcmp(option,"get") == 0) {
+        /*
+         * OPTION:  get ?globPattern? ?-option?
+         */
         if (objc > 2) {
             path = Tcl_GetStringFromObj(objv[2], (int*)NULL);
@@ -623 +637 @@
             RpOptimizerPerformInTcl, fitnessExpr);
 
+        fprintf(stderr, ">>>status=%d\n", status);
+
         Tcl_DecrRefCount(toolPtr);
         if (updateCmdPtr) {
@@ -637 +653 @@
             break;
         case RP_OPTIM_ABORTED:
+            fprintf(stderr, "Got abort status=%d\n", status);
             Tcl_SetResult(interp, "aborted", TCL_STATIC);
             break;
@@ -824 +841 @@
         status = Tcl_GlobalEval(toolDataPtr->interp,
             Tcl_DStringValue(&buffer));
-
         if (status == TCL_ERROR) {
             Tcl_BackgroundError(toolDataPtr->interp);
-        }
-        else if (status == TCL_BREAK || status == TCL_RETURN) {
-            result = RP_OPTIM_ABORTED;
-        }
+        } 
         Tcl_DStringFree(&buffer);
     }