Changeset 10197 for branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs

Timestamp:

12/05/13 15:21:24 (10 years ago)

Author:

mkommend

Message:

#1997: Added after deserialization hook for reevaluation of immigrants and made the analysis interval for the island GA configureable.

File:

• branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs (modified) (4 diffs)

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs

@@ -67 +67 @@
       get { return (ValueParameter<IntValue>)Parameters["MigrationInterval"]; }
     }
+    protected IFixedValueParameter<IntValue> AnalysisIntervalParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["AnalysisInterval"]; }
+    }
     protected ValueParameter<PercentValue> MigrationRateParameter {
       get { return (ValueParameter<PercentValue>)Parameters["MigrationRate"]; }
@@ -130 +133 @@
       get { return MigrationIntervalParameter.Value; }
       set { MigrationIntervalParameter.Value = value; }
+    }
+    public int AnalysisInterval {
+      get { return AnalysisIntervalParameter.Value.Value; }
+      set { AnalysisIntervalParameter.Value.Value = value; }
     }
     public PercentValue MigrationRate {
@@ -218 +225 @@
         Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", (BoolValue)new BoolValue(false).AsReadOnly()) { Hidden = true });
       }
+      if (!Parameters.ContainsKey("ReevaluateImmigrants")) {
+        Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateImmigrants", "Flag which indicates if inviduals should be reevaluated before they are immigrated.", new BoolValue(false)) { Hidden = true });
+      }
+      if (!Parameters.ContainsKey("AnalysisInterval")) {
+        Parameters.Add(new ValueParameter<IntValue>("AnalysisInterval", "The number of generations that should pass between the analyzers should be executed (should be <= MigrationInteval).", new IntValue(20)) { Hidden = true });
+      }
       #endregion
 
@@ -238 +251 @@
       Parameters.Add(new ValueParameter<IntValue>("NumberOfIslands", "The number of islands.", new IntValue(5)));
       Parameters.Add(new ValueParameter<IntValue>("MigrationInterval", "The number of generations that should pass between migration phases.", new IntValue(20)));
+      Parameters.Add(new ValueParameter<IntValue>("AnalysisInterval", "The number of generations that should pass between the analyzers should be executed (should be <= MigrationInteval).", new IntValue(20)) { Hidden = true });
       Parameters.Add(new ValueParameter<PercentValue>("MigrationRate", "The proportion of individuals that should migrate between the islands.", new PercentValue(0.15)));
       Parameters.Add(new ConstrainedValueParameter<IMigrator>("Migrator", "The migration strategy."));