Changeset 986 for trunk/optimizer/src/pgapack

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/pgapack/pgapack

Files:

• examples/c/classic (modified) (previous)
• examples/c/dejong (modified) (previous)
• examples/c/example (modified) (previous)
• examples/c/maxbit (modified) (previous)
• examples/c/maxchar (modified) (previous)
• examples/c/maxint (modified) (previous)
• examples/c/name (modified) (previous)
• examples/c/namefull (modified) (previous)
• examples/c/udtstr (modified) (previous)
• source/parallel.c (modified) (4 diffs)
• source/pga.c (modified) (2 diffs)
• source/stop.c (modified) (2 diffs)
• test/instverf (modified) (previous)

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;
+}