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

Timestamp:

03/17/11 14:35:58 (13 years ago)

Author:

svonolfe

Message:

Implemented review comments of swagner (#1425)

File:

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

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

@@ -69 +69 @@
       get { return (LookupParameter<IntValue>)Parameters["EvaluatedSolutions"]; }
     }
-    public ValueLookupParameter<ILocalImprovement> LocalImprovementParameter {
-      get { return (ValueLookupParameter<ILocalImprovement>)Parameters["LocalImprovement"]; }
+    public ValueLookupParameter<ILocalImprovementOperator> LocalImprovementParameter {
+      get { return (ValueLookupParameter<ILocalImprovementOperator>)Parameters["LocalImprovement"]; }
     }
     public ValueLookupParameter<IShakingOperator> ShakingParameter {
@@ -102 +102 @@
       Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze the solution."));
       Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The number of evaluated solutions."));
-      Parameters.Add(new ValueLookupParameter<ILocalImprovement>("LocalImprovement", "The local improvement operation."));
+      Parameters.Add(new ValueLookupParameter<ILocalImprovementOperator>("LocalImprovement", "The local improvement operation."));
       Parameters.Add(new ValueLookupParameter<IShakingOperator>("Shaking", "The shaking operation."));
       #endregion
@@ -116 +116 @@
       Assigner iterationInit = new Assigner();
 
-      ChildrenCreator createChild = new ChildrenCreator();
+      SubScopesCloner createChild = new SubScopesCloner();
       SubScopesProcessor childProcessor = new SubScopesProcessor();
-      ParentCopyCrossover parentCloner = new ParentCopyCrossover();
 
       Assigner qualityAssigner = new Assigner();
@@ -127 +126 @@
 
       QualityComparator qualityComparator = new QualityComparator();
-      ConditionalBranch improvesQualityBranch = new ConditionalBranch();
+      ConditionalBranch improvesQualityBranch1 = new ConditionalBranch();
       ConditionalBranch improvesQualityBranch2 = new ConditionalBranch();
 
       Assigner bestQualityUpdater = new Assigner();
-      ScopeCleaner cleaner = new ScopeCleaner();
-      ParentCopyCrossover originalRestorer = new ParentCopyCrossover();
+
+      BestSelector bestSelector = new BestSelector();
+      RightReducer rightReducer = new RightReducer();
 
       IntCounter indexCounter = new IntCounter();
       Assigner indexResetter = new Assigner();
 
-      SubScopesRemover remover1 = new SubScopesRemover();
-      SubScopesRemover remover2 = new SubScopesRemover();
       Placeholder analyzer2 = new Placeholder();
 
@@ -147 +145 @@
       ConditionalBranch iterationsTermination = new ConditionalBranch();
 
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("OuterIterations", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Index", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>("Continue", new BoolValue(false)));
@@ -161 +159 @@
 
       resultsCollector1.CopyValue = new BoolValue(false);
-      resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("OuterIterations"));
+      resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Iterations"));
       resultsCollector1.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Quality", null, "BestQuality"));
       resultsCollector1.ResultsParameter.ActualName = ResultsParameter.Name;
@@ -172 +170 @@
 
       createChild.Name = "Create child";
-      createChild.ParentsPerChild.Value = 1;
-
-      parentCloner.Name = "Copy parent";
 
       qualityAssigner.Name = "Assign quality";
@@ -189 +184 @@
       evaluator.OperatorParameter.ActualName = EvaluatorParameter.Name;
 
-      evalCounter.Name = "Count evaluateions";
+      evalCounter.Name = "Count evaluations";
       evalCounter.Increment.Value = 1;
       evalCounter.ValueParameter.ActualName = EvaluatedSolutionsParameter.ActualName;
@@ -197 +192 @@
       qualityComparator.ResultParameter.ActualName = "IsBetter";
 
-      improvesQualityBranch.ConditionParameter.ActualName = "IsBetter";
+      improvesQualityBranch1.ConditionParameter.ActualName = "IsBetter";
       improvesQualityBranch2.ConditionParameter.ActualName = "IsBetter";
 
@@ -204 +199 @@
       bestQualityUpdater.RightSideParameter.ActualName = QualityParameter.Name;
 
-      cleaner.Name = "Clean scope";
-      cleaner.ClearSubScopesParameter.Value = new BoolValue(false);
-      originalRestorer.Name = "Restore original solution";
+      bestSelector.CopySelected = new BoolValue(false);
+      bestSelector.MaximizationParameter.ActualName = MaximizationParameter.Name;
+      bestSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(1);
+      bestSelector.QualityParameter.ActualName = QualityParameter.Name;
 
       indexCounter.Name = "Count index";
@@ -216 +212 @@
       indexResetter.RightSideParameter.Value = new IntValue(0);
 
-      remover1.Name = remover2.Name = "Remove subscope";
-
       analyzer2.Name = "Analyzer (placeholder)";
       analyzer2.OperatorParameter.ActualName = AnalyzerParameter.Name;
 
-      originalRestorer.Name = "Restore parent";
-
       iterationsCounter.Name = "Iterations Counter";
       iterationsCounter.Increment = new IntValue(1);
-      iterationsCounter.ValueParameter.ActualName = "OuterIterations";
+      iterationsCounter.ValueParameter.ActualName = "Iterations";
 
       iterationsComparator.Name = "Iterations >= MaximumIterations";
       iterationsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
-      iterationsComparator.LeftSideParameter.ActualName = "OuterIterations";
+      iterationsComparator.LeftSideParameter.ActualName = "Iterations";
       iterationsComparator.RightSideParameter.ActualName = MaximumIterationsParameter.Name;
       iterationsComparator.ResultParameter.ActualName = "Terminate";
@@ -254 +246 @@
 
       createChild.Successor = childProcessor;
-      childProcessor.Operators.Add(parentCloner);
-      childProcessor.Successor = analyzer2;
+      childProcessor.Operators.Add(new EmptyOperator());
+      childProcessor.Operators.Add(qualityAssigner);
+      childProcessor.Successor = bestSelector;
       /////////
-      parentCloner.Successor = qualityAssigner;
       qualityAssigner.Successor = shaking;
       shaking.Successor = evaluator;
@@ -263 +255 @@
       evalCounter.Successor = localImprovement;
       localImprovement.Successor = qualityComparator;
-      qualityComparator.Successor = improvesQualityBranch;
-      improvesQualityBranch.TrueBranch = bestQualityUpdater;
-      improvesQualityBranch.FalseBranch = cleaner;
+      qualityComparator.Successor = improvesQualityBranch1;
+      improvesQualityBranch1.TrueBranch = bestQualityUpdater;
+      improvesQualityBranch1.FalseBranch = indexCounter;
 
       bestQualityUpdater.Successor = indexResetter;
-      indexResetter.Successor = remover1;
-
-      cleaner.Successor = originalRestorer;
-      originalRestorer.Successor = remover2;
-      remover2.Successor = indexCounter;
+      indexResetter.Successor = null;
+
+      indexCounter.Successor = null;
       /////////
+      bestSelector.Successor = rightReducer;
+      rightReducer.Successor = analyzer2;
       analyzer2.Successor = indexTermination;
       indexTermination.TrueBranch = improvesQualityBranch2;