Changeset 10591 for branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3

Timestamp:

03/12/14 21:01:02 (10 years ago)

Author:

mkommend

Message:

#1997: Added reevaluation of all indidviduals after migration to island algorithms and fixed symbolic data analysis evaluators for island algorithms.

File:

• branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithmMainLoop.cs (modified) (3 diffs)

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithmMainLoop.cs

@@ -130 +130 @@
       get { return (LookupParameter<IntValue>)Parameters["EvaluatedSolutions"]; }
     }
-    public ValueLookupParameter<BoolValue> ReevaluateImmigrants {
-      get { return (ValueLookupParameter<BoolValue>)Parameters["ReevaluateImmigrants"]; }
+    public ValueLookupParameter<BoolValue> ReevaluateIndividualsAfterMigration {
+      get { return (ValueLookupParameter<BoolValue>)Parameters["ReevaluateIndividualsAfterMigration"]; }
     }
     #endregion
@@ -177 +177 @@
       Parameters.Add(new ValueLookupParameter<IOperator>("IslandAnalyzer", "The operator used to analyze each island."));
       Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The number of times solutions have been evaluated."));
-      Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateImmigrants", "Flag which indicates if inviduals should be reevaluated before they are immigrated."));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateIndividualsAfterMigration", "Flag which indicates if inviduals should be reevaluated after migration."));
       #endregion
 
@@ -422 +422 @@
       reevaluateImmigrantsBranch.TrueBranch = uniformSubScopesProcessor3;
       uniformSubScopesProcessor3.Operator = subScopesProcessor;
-      subScopesProcessor.Operators.Add(new EmptyOperator());
+      subScopesProcessor.Operators.Add(uniformSubScopesProcessor4);
       subScopesProcessor.Operators.Add(uniformSubScopesProcessor4);
       uniformSubScopesProcessor4.Operator = evaluator;