Changeset 3143

Timestamp:

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

Author:

abeham

Message:

changed some things in the main loops #933

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchMainLoop.cs (modified) (5 diffs)
• HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs (modified) (3 diffs)

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

@@ -164 +164 @@
 
       moveGenerator.Name = "MoveGenerator (placeholder)";
-      moveGenerator.OperatorParameter.ActualName = "MoveGenerator";
+      moveGenerator.OperatorParameter.ActualName = MoveGeneratorParameter.Name;
 
       moveEvaluator.Name = "MoveEvaluator (placeholder)";
-      moveEvaluator.OperatorParameter.ActualName = "MoveEvaluator";
+      moveEvaluator.OperatorParameter.ActualName = MoveEvaluatorParameter.Name;
 
       bestSelector.CopySelected = new BoolValue(false);
-      bestSelector.MaximizationParameter.ActualName = "Maximization";
+      bestSelector.MaximizationParameter.ActualName = MaximizationParameter.Name;
       bestSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(1);
-      bestSelector.QualityParameter.ActualName = "MoveQuality";
+      bestSelector.QualityParameter.ActualName = MoveQualityParameter.Name;
 
       moveMakingProcessor.Name = "MoveMaking processor (UniformSequentialSubScopesProcessor)";
 
-      qualityComparator.LeftSideParameter.ActualName = "MoveQuality";
-      qualityComparator.RightSideParameter.ActualName = "Quality";
+      qualityComparator.LeftSideParameter.ActualName = MoveQualityParameter.Name;
+      qualityComparator.RightSideParameter.ActualName = QualityParameter.Name;
       qualityComparator.ResultParameter.ActualName = "IsBetter";
 
@@ -183 +183 @@
 
       moveMaker.Name = "MoveMaker (placeholder)";
-      moveMaker.OperatorParameter.ActualName = "MoveMaker";
+      moveMaker.OperatorParameter.ActualName = MoveMakerParameter.Name;
 
       subScopesRemover.RemoveAllSubScopes = true;
@@ -191 +191 @@
       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 = "MaximumIterations";
-      iterationsComparator.ResultParameter.ActualName = "IterationsCondition";
+      iterationsComparator.RightSideParameter.ActualName = MaximumIterationsParameter.Name;
+      iterationsComparator.ResultParameter.ActualName = "Terminate";
 
       bestQualityMemorizer3.BestQualityParameter.ActualName = BestKnownQualityParameter.Name;
@@ -218 +218 @@
 
       iterationsTermination.Name = "Iterations Termination Condition";
-      iterationsTermination.ConditionParameter.ActualName = "IterationsCondition";
+      iterationsTermination.ConditionParameter.ActualName = "Terminate";
       #endregion
 
@@ -252 +252 @@
       qualityDifferenceCalculator2.Successor = visualizer2;
       visualizer2.Successor = iterationsTermination;
-      iterationsTermination.TrueBranch = mainProcessor;
-      iterationsTermination.FalseBranch = null;
+      iterationsTermination.TrueBranch = null;
+      iterationsTermination.FalseBranch = mainProcessor;
       #endregion
     }

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
     }