Changeset 5366 for trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm

Timestamp:

01/24/11 17:38:42 (13 years ago)

Author:

abeham

Message:

#1344

• Fixed discovery of the main loop operator in the MainLoop property

Location:

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

Files:

• GeneticAlgorithm.cs (modified) (2 diffs)
• IslandGeneticAlgorithm.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs

@@ -135 +135 @@
     }
     private GeneticAlgorithmMainLoop GeneticAlgorithmMainLoop {
-      get {
-        return (GeneticAlgorithmMainLoop)(
-          (ResultsCollector)(
-            (SubScopesCounter)SolutionsCreator.Successor
-          ).Successor
-        ).Successor;
-      }
+      get { return FindMainLoop(SolutionsCreator.Successor); }
     }
     [Storable]
@@ -375 +369 @@
       Analyzer.Operators.Add(qualityAnalyzer);
     }
+    private GeneticAlgorithmMainLoop FindMainLoop(IOperator start) {
+      IOperator mainLoop = start;
+      while (mainLoop != null && !(mainLoop is GeneticAlgorithmMainLoop))
+        mainLoop = ((SingleSuccessorOperator)mainLoop).Successor;
+      if (mainLoop == null) return null;
+      else return (GeneticAlgorithmMainLoop)mainLoop;
+    }
     #endregion
   }

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs

@@ -187 +187 @@
     }
     private IslandGeneticAlgorithmMainLoop MainLoop {
-      get {
-        return (IslandGeneticAlgorithmMainLoop)(
-          (ResultsCollector)(
-            (UniformSubScopesProcessor)(
-              (VariableCreator)IslandProcessor.Successor
-            ).Successor
-          ).Successor
-        ).Successor;
-      }
+      get { return FindMainLoop(IslandProcessor.Successor); }
     }
     [Storable]
@@ -506 +498 @@
       Analyzer.Operators.Add(qualityAnalyzer);
     }
+    private IslandGeneticAlgorithmMainLoop FindMainLoop(IOperator start) {
+      IOperator mainLoop = start;
+      while (mainLoop != null && !(mainLoop is IslandGeneticAlgorithmMainLoop))
+        mainLoop = ((SingleSuccessorOperator)mainLoop).Successor;
+      if (mainLoop == null) return null;
+      else return (IslandGeneticAlgorithmMainLoop)mainLoop;
+    }
     #endregion
   }