Changeset 10591

Timestamp:

03/12/14 21:01:02 (11 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.

Location:

branches/DataAnalysis.IslandAlgorithms

Files:

• HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandGeneticAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandOffspringSelectionGeneticAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithmMainLoop.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithmMainLoop.cs (modified) (3 diffs)

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandGeneticAlgorithm.cs

@@ -120 +120 @@
       insertionPoint.Successor = islandIndexAssigner;
 
-      //RandomCreator insertionPoint = OperatorGraph.Iterate().OfType<RandomCreator>().Skip(1).First();
-      //fixedSamplesPartitionCreator.Successor = insertionPoint.Successor;
-      //insertionPoint.Successor = fixedSamplesPartitionCreator;
+      ReevaluateImmigrants = true;
+      ReevaluteElites = true;
 
       RegisterParameterEvents();

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandOffspringSelectionGeneticAlgorithm.cs

@@ -120 +120 @@
       insertionPoint.Successor = islandIndexAssigner;
 
+      ReevaluateImmigrants = true;
+      ReevaluteElites = true;
+
       RegisterParameterEvents();
       RecalculateFixedSamplesPartitions();

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

@@ -123 +123 @@
     }
 
-    public ValueLookupParameter<BoolValue> ReevaluateImmigrants {
-      get { return (ValueLookupParameter<BoolValue>)Parameters["ReevaluateImmigrants"]; }
+    public ValueLookupParameter<BoolValue> ReevaluateIndividualsAfterMigration {
+      get { return (ValueLookupParameter<BoolValue>)Parameters["ReevaluateIndividualsAfterMigration"]; }
     }
     #endregion
@@ -167 +167 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("Migrate", "Migrate the island?"));
       Parameters.Add(new LookupParameter<BoolValue>("RunAnalysis", "Run Analyzers?"));
-      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
 
@@ -217 +217 @@
       Assigner evaluatedSolutionsAssigner2 = new Assigner();
       UniformSubScopesProcessor uniformSubScopesProcessor6 = new UniformSubScopesProcessor();
-      SubScopesProcessor subScopesProcessor3 = new SubScopesProcessor();
+      UniformSubScopesProcessor uniformSubScopesProcessor8 = new UniformSubScopesProcessor();
       DataReducer evaluatedSolutionsReducer2 = new DataReducer();
       UniformSubScopesProcessor uniformSubScopesProcessor7 = new UniformSubScopesProcessor();
@@ -457 +457 @@
       uniformSubScopesProcessor6.Successor = evaluatedSolutionsReducer2;
       uniformSubScopesProcessor6.Operator = evaluatedSolutionsAssigner2;
+      evaluatedSolutionsAssigner2.Successor = uniformSubScopesProcessor8;
+      uniformSubScopesProcessor8.Operator = uniformSubScopesProcessor3;
+      uniformSubScopesProcessor8.Successor = null;
       evaluatedSolutionsReducer2.Successor = null;
-      evaluatedSolutionsAssigner2.Successor = subScopesProcessor3;
-      subScopesProcessor3.Operators.Add(new EmptyOperator());
-      subScopesProcessor3.Operators.Add(uniformSubScopesProcessor3);
       uniformSubScopesProcessor7.Operator = immigrationReplacer;
       uniformSubScopesProcessor7.Successor = generationsComparator;

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;