Changeset 1178 for trunk/packages/optimizer/src

Timestamp:

Oct 7, 2008 6:03:52 PM (16 years ago)

Author:

liveletlive

Message:

Had earlier checked in files without these modifications which are necessary to make simple.tcl and app-qdot.tcl run

Location:

trunk/packages/optimizer/src/pgapack/pgapack

Files:

• include/pgapack.h (modified) (1 diff)
• source/restart.c (modified) (2 diffs)

trunk/packages/optimizer/src/pgapack/pgapack/include/pgapack.h

@@ -765 +765 @@
 void PGASetRestartAlleleChangeProb(PGAContext *ctx, double prob);
 double PGAGetRestartAlleleChangeProb(PGAContext *ctx);
+void PGASetRestartUserAction(int *userRestartCommand);
+int PGARestartCondition(PGAContext *ctx);
 
 /*****************************************

trunk/packages/optimizer/src/pgapack/pgapack/source/restart.c

@@ -72 +72 @@
 #include "pgapack.h"
 
+int *pgapack_user_cmd_restart = NULL;
 /*U****************************************************************************
    PGARestart - reseeds a population from the best string
@@ -329 +330 @@
 }
 
+void PGASetRestartUserAction(int *userRestartCommand)
+{
+        pgapack_user_cmd_restart = userRestartCommand; 
+}
+
+int PGARestartCondition(PGAContext *ctx){
+        int ifRestart = PGA_FALSE;
+        if (  (pgapack_user_cmd_restart!=NULL && *pgapack_user_cmd_restart==PGA_TRUE)       ||
+                        (
+                                (ctx->ga.restart == PGA_TRUE) &&
+                                (ctx->ga.ItersOfSame % ctx->ga.restartFreq == 0)
+                        )
+           ) {
+                        ifRestart = PGA_TRUE;
+                 }
+                 
+        if ((ctx->ga.restart == PGA_TRUE) &&
+        (ctx->ga.ItersOfSame % ctx->ga.restartFreq == 0)) {
+                ctx->ga.ItersOfSame++;
+        }
+        if (pgapack_user_cmd_restart!=NULL){
+                *pgapack_user_cmd_restart = PGA_FALSE;
+        }
+        return ifRestart;
+}
+