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

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.TabuSearch/3.3/TabuSearch.cs (modified) (2 diffs)

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

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