Changeset 7310

Timestamp:

01/10/12 23:27:04 (13 years ago)

Author:

ascheibe

Message:

#1745

• moved island analyzer to islands
• fixed bug which lead to bad performance compared to the original island GA

File:

• branches/HiveHiveEngine/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/ParallelIslandGeneticAlgorithmMainLoop.cs (modified) (3 diffs)

branches/HiveHiveEngine/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/ParallelIslandGeneticAlgorithmMainLoop.cs

@@ -183 +183 @@
       SubScopesIntReducer generationsReducer = new SubScopesIntReducer();
       AllSubScopesIntReducer evaluatedSolutionsReducer = new AllSubScopesIntReducer();
-      UniformSubScopesProcessor uniformSubScopesProcessor4 = new UniformSubScopesProcessor();
       Placeholder islandAnalyzer2 = new Placeholder();
       UniformSubScopesProcessor uniformSubScopesProcessor5 = new UniformSubScopesProcessor();
@@ -317 +316 @@
       generationsReducer.Successor = evaluatedSolutionsReducer;
       evaluatedSolutionsReducer.Successor = migrationsCounter;
-      migrationsCounter.Successor = uniformSubScopesProcessor4;
+      migrationsCounter.Successor = uniformSubScopesProcessor5;
       generationsAssigner.Successor = evaluatedSolutionsAssigner;
       evaluatedSolutionsAssigner.Successor = selector;
@@ -341 +340 @@
       subScopesProcessor2.Operators.Add(new EmptyOperator());
       subScopesProcessor2.Successor = mergingReducer;
-      mergingReducer.Successor = null;
+      mergingReducer.Successor = islandAnalyzer2;
       bestSelector.Successor = rightReducer;
-      rightReducer.Successor = islandGenerationsCounter;
+      rightReducer.Successor = null;
+      islandAnalyzer2.Successor = islandGenerationsCounter;
       islandGenerationsCounter.Successor = checkIslandGenerationsReachedMaximum;
       checkIslandGenerationsReachedMaximum.Successor = checkContinueEvolution;
-      uniformSubScopesProcessor4.Operator = islandAnalyzer2;
-      uniformSubScopesProcessor4.Successor = uniformSubScopesProcessor5;
-      islandAnalyzer2.Successor = null;
       uniformSubScopesProcessor5.Operator = emigrantsSelector;
       emigrantsSelector.Successor = null;