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

Timestamp:

03/20/10 19:04:06 (14 years ago)

Author:

abeham

Message:

changed some things in the main loops #933

File:

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

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

@@ -212 +212 @@
       iterationsCounter.ValueParameter.ActualName = "Iterations";
 
-      iterationsComparator.Name = "Iterations Comparator";
-      iterationsComparator.Comparison = new Comparison(ComparisonType.Less);
+      iterationsComparator.Name = "Iterations >= MaximumIterations";
+      iterationsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
       iterationsComparator.LeftSideParameter.ActualName = "Iterations";
       iterationsComparator.RightSideParameter.ActualName = MaximumIterationsParameter.Name;
-      iterationsComparator.ResultParameter.ActualName = "IterationsCondition";
+      iterationsComparator.ResultParameter.ActualName = "Terminate";
 
       bestQualityMemorizer3.BestQualityParameter.ActualName = "BestQuality";
@@ -235 +235 @@
 
       iterationsTermination.Name = "Iterations Termination Condition";
-      iterationsTermination.ConditionParameter.ActualName = "IterationsCondition";
+      iterationsTermination.ConditionParameter.ActualName = "Terminate";
       #endregion
 
@@ -270 +270 @@
       qualityDifferenceCalculator2.Successor = visualizer2;
       visualizer2.Successor = iterationsTermination;
-      iterationsTermination.TrueBranch = mainProcessor;
-      iterationsTermination.FalseBranch = null;
+      iterationsTermination.TrueBranch = null;
+      iterationsTermination.FalseBranch = mainProcessor;
       #endregion
     }