Changeset 5622 for branches/VNS/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearchMainLoop.cs

Timestamp:

03/07/11 17:23:04 (13 years ago)

Author:

svonolfe

Message:

Worked on VNS (#1425)

File:

• branches/VNS/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearchMainLoop.cs (modified) (6 diffs)

branches/VNS/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearchMainLoop.cs

@@ -32 +32 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Selection;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Algorithms.VariableNeighborhoodSearch {
@@ -123 +124 @@
       Placeholder localImprovement = new Placeholder();
       Placeholder evaluator = new Placeholder();
+      IntCounter evalCounter = new IntCounter();
 
       QualityComparator qualityComparator = new QualityComparator();
@@ -187 +189 @@
       evaluator.OperatorParameter.ActualName = EvaluatorParameter.Name;
 
+      evalCounter.Name = "Count evaluateions";
+      evalCounter.Increment.Value = 1;
+      evalCounter.ValueParameter.ActualName = EvaluatedSolutionsParameter.ActualName;
+
       qualityComparator.LeftSideParameter.ActualName = QualityParameter.Name;
       qualityComparator.RightSideParameter.ActualName = "OriginalQuality";
@@ -236 +242 @@
       #region Create operator graph
       OperatorGraph.InitialOperator = variableCreator;
-      variableCreator.Successor = subScopesProcessor0;
+      variableCreator.Successor = analyzer1;
+      analyzer1.Successor = subScopesProcessor0;
       subScopesProcessor0.Operators.Add(bestQualityInitializer);
       subScopesProcessor0.Successor = resultsCollector1;
-      //////////
-      bestQualityInitializer.Successor = analyzer1;
       /////////
       resultsCollector1.Successor = iteration;
@@ -250 +255 @@
       createChild.Successor = childProcessor;
       childProcessor.Operators.Add(parentCloner);
-      childProcessor.Successor = indexTermination;
+      childProcessor.Successor = analyzer2;
       /////////
       parentCloner.Successor = qualityAssigner;
       qualityAssigner.Successor = shaking;
-      shaking.Successor = localImprovement;
-      localImprovement.Successor = evaluator;
-      evaluator.Successor = qualityComparator;
+      shaking.Successor = evaluator;
+      evaluator.Successor = evalCounter;
+      evalCounter.Successor = localImprovement;
+      localImprovement.Successor = qualityComparator;
       qualityComparator.Successor = improvesQualityBranch;
       improvesQualityBranch.TrueBranch = bestQualityUpdater;
@@ -268 +274 @@
       remover2.Successor = indexCounter;
       /////////
+      analyzer2.Successor = indexTermination;
       indexTermination.TrueBranch = improvesQualityBranch2;
       indexTermination.FalseBranch = null;