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

Timestamp:

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

Author:

abeham

Message:

#1344

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

File:

• trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.cs (modified) (2 diffs)

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

@@ -118 +118 @@
     }
     private LocalSearchMainLoop MainLoop {
-      get {
-        return (LocalSearchMainLoop)(
-          (ResultsCollector)(
-            (VariableCreator)SolutionsCreator.Successor
-          ).Successor
-        ).Successor;
-      }
+      get { return FindMainLoop(SolutionsCreator.Successor); }
     }
     [Storable]
@@ -396 +390 @@
       }
     }
+    private LocalSearchMainLoop FindMainLoop(IOperator start) {
+      IOperator mainLoop = start;
+      while (mainLoop != null && !(mainLoop is LocalSearchMainLoop))
+        mainLoop = ((SingleSuccessorOperator)mainLoop).Successor;
+      if (mainLoop == null) return null;
+      else return (LocalSearchMainLoop)mainLoop;
+    }
     #endregion
   }