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

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

File:

• trunk/sources/HeuristicLab.Algorithms.NSGA2/3.3/NSGA2.cs (modified) (3 diffs)

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

@@ -42 +42 @@
   [StorableClass]
   public class NSGA2 : EngineAlgorithm, IStorableContent {
+    public string Filename { get; set; }
+
     #region Problem Properties
     public override Type ProblemType {
@@ -143 +145 @@
     }
     private NSGA2MainLoop MainLoop {
-      get {
-        return (NSGA2MainLoop)(
-          (ResultsCollector)RankAndCrowdingSorter.Successor
-        ).Successor;
-      }
+      get { return FindMainLoop(RankAndCrowdingSorter.Successor); }
     }
     #endregion
@@ -392 +390 @@
       Analyzer.Operators.Add(paretoFrontAnalyzer);
     }
+    private NSGA2MainLoop FindMainLoop(IOperator start) {
+      IOperator mainLoop = start;
+      while (mainLoop != null && !(mainLoop is NSGA2MainLoop))
+        mainLoop = ((SingleSuccessorOperator)mainLoop).Successor;
+      if (mainLoop == null) return null;
+      else return (NSGA2MainLoop)mainLoop;
+    }
     #endregion
-
-    public string Filename {
-      get;
-      set;
-    }
   }
 }