Changeset 5735

Timestamp:

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

Author:

svonolfe

Message:

Implemented review comments of swagner (#1425)

Location:

branches/VNS

Files:

• HeuristicLab.Algorithms.LocalSearch/3.3/HeuristicLab.Algorithms.LocalSearch-3.3.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchImprovementOperator.cs (moved) (moved from branches/VNS/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchImprovement.cs) (8 diffs)
• HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchMainLoop.cs (modified) (9 diffs)
• HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearchMainLoop.cs (modified) (13 diffs)
• HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj (modified) (1 diff)
• HeuristicLab.Operators/3.3/ScopeCleaner.cs (modified) (3 diffs)
• HeuristicLab.Operators/3.3/SubScopesCloner.cs (added)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ILocalImprovementOperator.cs (moved) (moved from branches/VNS/HeuristicLab.Optimization/3.3/Interfaces/ILocalImprovement.cs) (1 diff)

branches/VNS/HeuristicLab.Algorithms.LocalSearch/3.3/HeuristicLab.Algorithms.LocalSearch-3.3.csproj

@@ -108 +108 @@
   <ItemGroup>
     <Compile Include="HeuristicLabAlgorithmsLocalSearchPlugin.cs" />
-    <Compile Include="LocalSearchImprovement.cs" />
+    <Compile Include="LocalSearchImprovementOperator.cs" />
     <Compile Include="LocalSearchMainLoop.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

branches/VNS/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchImprovementOperator.cs

@@ -33 +33 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Optimization.Operators;
+using HeuristicLab.Analysis;
 
 namespace HeuristicLab.Algorithms.LocalSearch {
@@ -38 +39 @@
   /// A local search improvement operator.
   /// </summary>
-  [Item("LocalSearchImprovement", "A local search improvement operator.")]
+  [Item("LocalSearchImprovementOperator", "A local search improvement operator.")]
   [StorableClass]
-  public class LocalSearchImprovement: SingleSuccessorOperator, ILocalImprovement {
+  public class LocalSearchImprovementOperator: SingleSuccessorOperator, ILocalImprovementOperator {
     [Storable]
     private LocalSearchMainLoop loop;
+
+    [Storable]
+    private BestAverageWorstQualityAnalyzer qualityAnalyzer;
     
     private ConstrainedValueParameter<IMoveGenerator> MoveGeneratorParameter {
@@ -62 +66 @@
       get { return (LookupParameter<IntValue>)Parameters["EvaluatedSolutions"]; }
     }
-    public LookupParameter<IOperator> AnalyzerParameter {
-      get { return (LookupParameter<IOperator>)Parameters["Analyzer"]; }
+    public ValueParameter<MultiAnalyzer> AnalyzerParameter {
+      get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
     }
 
@@ -78 +82 @@
       set { MoveEvaluatorParameter.Value = value; }
     }
+    public MultiAnalyzer Analyzer {
+      get { return AnalyzerParameter.Value; }
+      set { AnalyzerParameter.Value = value; }
+    }
 
     [StorableConstructor]
-    protected LocalSearchImprovement(bool deserializing) : base(deserializing) {}
+    protected LocalSearchImprovementOperator(bool deserializing) : base(deserializing) {}
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
       Initialize();
     }
-    protected LocalSearchImprovement(LocalSearchImprovement original, Cloner cloner)
+    protected LocalSearchImprovementOperator(LocalSearchImprovementOperator original, Cloner cloner)
       : base(original, cloner) {
         this.loop = cloner.Clone(original.loop);
+        this.qualityAnalyzer = cloner.Clone(original.qualityAnalyzer);
         Initialize();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new LocalSearchImprovement(this, cloner);
-    }
-    public LocalSearchImprovement()
+      return new LocalSearchImprovementOperator(this, cloner);
+    }
+    public LocalSearchImprovementOperator()
       : base() {
-        loop = new LocalSearchMainLoop(new BoolValue(true));
+        loop = new LocalSearchMainLoop("LocalIterations", "BestLocalQuality");
+
+        ResultsCollector rc = ((loop.OperatorGraph.InitialOperator as SingleSuccessorOperator).Successor 
+          as SingleSuccessorOperator).Successor as ResultsCollector;
+        rc.CollectedValues.Remove("BestLocalQuality");
+
+        qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
 
         Parameters.Add(new ConstrainedValueParameter<IMoveGenerator>("MoveGenerator", "The operator used to generate moves to the neighborhood of the current solution."));
         Parameters.Add(new ConstrainedValueParameter<IMoveMaker>("MoveMaker", "The operator used to perform a move."));
         Parameters.Add(new ConstrainedValueParameter<ISingleObjectiveMoveEvaluator>("MoveEvaluator", "The operator used to evaluate a move."));
-        Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of generations which should be processed.", new IntValue(1000)));
-        Parameters.Add(new ValueParameter<IntValue>("SampleSize", "Number of moves that MultiMoveGenerators should create. This is ignored for Exhaustive- and SingleMoveGenerators.", new IntValue(100)));
+        Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of generations which should be processed.", new IntValue(150)));
+        Parameters.Add(new ValueParameter<IntValue>("SampleSize", "Number of moves that MultiMoveGenerators should create. This is ignored for Exhaustive- and SingleMoveGenerators.", new IntValue(1500)));
         Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The number of evaluated moves."));
-        Parameters.Add(new LookupParameter<IOperator>("Analyzer", "The operator used to analyze the solution."));
+        Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze the solution.", new MultiAnalyzer()));
 
         Initialize();
@@ -112 +127 @@
     }
 
-    public void Parameterize(IProblem problem) {
+    public void OnProblemChanged(IProblem problem) {
       UpdateMoveOperators(problem);
       ChooseMoveOperators();
@@ -119 +134 @@
       ParameterizeMoveEvaluators(problem as ISingleObjectiveProblem);
       ParameterizeMoveMakers(problem as ISingleObjectiveProblem);
+
+      ParameterizeAnalyzers(problem as ISingleObjectiveProblem);
+      UpdateAnalyzers(problem as ISingleObjectiveProblem);
+    }
+
+    void ParameterizeAnalyzers(ISingleObjectiveProblem problem) {
+      qualityAnalyzer.ResultsParameter.ActualName = "Results";
+      if (problem != null) {
+        qualityAnalyzer.MaximizationParameter.ActualName = problem.MaximizationParameter.Name;
+        if (MoveEvaluator != null)
+          qualityAnalyzer.QualityParameter.ActualName = MoveEvaluator.MoveQualityParameter.ActualName;
+        qualityAnalyzer.BestKnownQualityParameter.ActualName = problem.BestKnownQualityParameter.Name;
+      }
+    }
+
+    void UpdateAnalyzers(ISingleObjectiveProblem problem) {
+      Analyzer.Operators.Clear();
+      if (problem != null) {
+        foreach (IAnalyzer analyzer in problem.Operators.OfType<IAnalyzer>()) {
+          IAnalyzer clone = analyzer.Clone() as IAnalyzer;
+          foreach (IScopeTreeLookupParameter param in clone.Parameters.OfType<IScopeTreeLookupParameter>())
+            param.Depth = 0;
+          Analyzer.Operators.Add(clone);
+        }
+      }
+      Analyzer.Operators.Add(qualityAnalyzer);
     }
 
@@ -245 +286 @@
       }
 
-      loop.MoveGeneratorParameter.Value = MoveGeneratorParameter.Value;
-      if (loop.MoveGeneratorParameter.Value != null && loop.MoveGeneratorParameter.Value.Parameters.ContainsKey("SampleSize")) {
-        IParameter parameter = loop.MoveGeneratorParameter.Value.Parameters["SampleSize"];
-        if(parameter is IValueParameter)
-          (parameter as IValueParameter).Value = SampleSizeParameter.Value;
-      }
-      loop.MoveEvaluatorParameter.Value = MoveEvaluatorParameter.Value;
-      loop.MoveMakerParameter.Value = MoveMakerParameter.Value;
-      loop.MaximumIterationsParameter.Value = MaximumIterationsParameter.Value;
       loop.EvaluatedMovesParameter.ActualName = EvaluatedSolutionsParameter.ActualName;
-      if (AnalyzerParameter.ActualValue != null) {
-        loop.AnalyzerParameter.Value = AnalyzerParameter.ActualValue.Clone() as IAnalyzer;
-
-        foreach (IScopeTreeLookupParameter param in loop.AnalyzerParameter.Value.Parameters.OfType<IScopeTreeLookupParameter>())
-          param.Depth = 0;
-
-        if (loop.AnalyzerParameter.Value is IMultiAnalyzer) {
-          foreach (IAnalyzer analyzer in (loop.AnalyzerParameter.Value as IMultiAnalyzer).Operators) {
-            foreach (IScopeTreeLookupParameter param in analyzer.Parameters.OfType<IScopeTreeLookupParameter>())
-              param.Depth = 0;
-          }
-        }
-      } else {
-        loop.AnalyzerParameter.Value = null;
-      }
-            
+
       processor.Operators.Add(loop);
       processor.Successor = remover;
@@ -279 +296 @@
       }
 
-      return ExecutionContext.CreateOperation(processor);
+      return ExecutionContext.CreateChildOperation(processor);
     }
   }

branches/VNS/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchMainLoop.cs

@@ -77 +77 @@
     [StorableConstructor]
     private LocalSearchMainLoop(bool deserializing) : base(deserializing) { }
+    public LocalSearchMainLoop(string iterationsName, string bestQualityName)
+      : base() {
+        Initialize(iterationsName, bestQualityName);
+    }
     public LocalSearchMainLoop()
       : base() {
-      Initialize(false);
-    }
-    public LocalSearchMainLoop(BoolValue nested)
-      : base() {
-      Initialize(nested.Value);
+      Initialize("Iterations", "BestQuality");
     }
     private LocalSearchMainLoop(LocalSearchMainLoop original, Cloner cloner)
@@ -92 +92 @@
     }
 
-    private void Initialize(bool nested) {
+    private void Initialize(string iterationsName, string bestQualityName) {
       #region Create parameters
       Parameters.Add(new ValueLookupParameter<IRandom>("Random", "A pseudo random number generator."));
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false."));
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
+      Parameters.Add(new LookupParameter<DoubleValue>("BestQuality", "The value which represents the best quality fjo."));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("BestKnownQuality", "The best known quality value found so far."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The value which represents the quality of a move."));
@@ -128 +129 @@
       Placeholder moveMaker = new Placeholder();
       Assigner bestQualityUpdater = new Assigner();
+      ResultsCollector resultsCollector2 = new ResultsCollector();
       MergingReducer mergingReducer = new MergingReducer();
       Placeholder analyzer2 = new Placeholder();
@@ -135 +137 @@
       ConditionalBranch iterationsTermination = new ConditionalBranch();
 
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0))); // Class LocalSearch expects this to be called Iterations
-      if (!nested) {
-        variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("BestQuality", new DoubleValue(0)));
-      }
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>(iterationsName, new IntValue(0))); // Class LocalSearch expects this to be called Iterations
+      variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>(bestQualityName, new DoubleValue(0)));
 
       bestQualityInitializer.Name = "Initialize BestQuality";
-      bestQualityInitializer.LeftSideParameter.ActualName = "BestQuality";
+      bestQualityInitializer.LeftSideParameter.ActualName = bestQualityName;
       bestQualityInitializer.RightSideParameter.ActualName = QualityParameter.Name;
 
@@ -148 +148 @@
 
       resultsCollector1.CopyValue = new BoolValue(false);
-      resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Iterations"));
-      if (!nested) {
-        resultsCollector1.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Quality", null, "BestQuality"));
-      }
+      resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>(iterationsName));
+      resultsCollector1.CollectedValues.Add(new LookupParameter<DoubleValue>(bestQualityName, null, bestQualityName));
       resultsCollector1.ResultsParameter.ActualName = ResultsParameter.Name;
 
@@ -180 +178 @@
 
       bestQualityUpdater.Name = "Update BestQuality";
-      bestQualityUpdater.LeftSideParameter.ActualName = "BestQuality";
+      bestQualityUpdater.LeftSideParameter.ActualName = bestQualityName;
       bestQualityUpdater.RightSideParameter.ActualName = QualityParameter.Name;
+
+      resultsCollector2.CopyValue = new BoolValue(false);
+      resultsCollector2.CollectedValues.Add(new LookupParameter<DoubleValue>(bestQualityName, null, bestQualityName));
+      resultsCollector2.ResultsParameter.ActualName = ResultsParameter.Name;
 
       analyzer2.Name = "Analyzer (placeholder)";
@@ -190 +192 @@
       iterationsCounter.Name = "Iterations Counter";
       iterationsCounter.Increment = new IntValue(1);
-      iterationsCounter.ValueParameter.ActualName = "Iterations";
+      iterationsCounter.ValueParameter.ActualName = iterationsName;
 
       iterationsComparator.Name = "Iterations >= MaximumIterations";
       iterationsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
-      iterationsComparator.LeftSideParameter.ActualName = "Iterations";
+      iterationsComparator.LeftSideParameter.ActualName = iterationsName;
       iterationsComparator.RightSideParameter.ActualName = MaximumIterationsParameter.Name;
       iterationsComparator.ResultParameter.ActualName = "Terminate";
@@ -205 +207 @@
       OperatorGraph.InitialOperator = variableCreator;
       variableCreator.Successor = subScopesProcessor0;
-      if (!nested) {
-        subScopesProcessor0.Operators.Add(bestQualityInitializer);
-      } else {
-        subScopesProcessor0.Operators.Add(analyzer1);
-      }
+      subScopesProcessor0.Operators.Add(bestQualityInitializer);
       subScopesProcessor0.Successor = resultsCollector1;
       bestQualityInitializer.Successor = analyzer1;
@@ -230 +228 @@
       improvesQualityBranch.FalseBranch = null;
       improvesQualityBranch.Successor = null;
-      if (!nested) {
-        moveMaker.Successor = bestQualityUpdater;
-      } else {
-        moveMaker.Successor = null; 
-      }
+      moveMaker.Successor = bestQualityUpdater;
       bestQualityUpdater.Successor = null;
       mergingReducer.Successor = analyzer2;

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

@@ -39 +39 @@
       get { return (ValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; }
     }
-    private ValueParameter<ILocalImprovement> LocalImprovementParameter {
-      get { return (ValueParameter<ILocalImprovement>)Parameters["LocalImprovement"]; }
+    private ValueParameter<ILocalImprovementOperator> LocalImprovementParameter {
+      get { return (ValueParameter<ILocalImprovementOperator>)Parameters["LocalImprovement"]; }
     }
     private ValueParameter<IShakingOperator> ShakingParameter {
@@ -90 +90 @@
       Parameters.Add(new ValueParameter<IntValue>("Seed", "The random seed used to initialize the new pseudo random number generator.", new IntValue(0)));
       Parameters.Add(new ValueParameter<BoolValue>("SetSeedRandomly", "True if the random seed should be set to a random value, otherwise false.", new BoolValue(true)));
-      Parameters.Add(new ValueParameter<ILocalImprovement>("LocalImprovement", "The local improvement operation", new LocalSearchImprovement()));
+      Parameters.Add(new ValueParameter<ILocalImprovementOperator>("LocalImprovement", "The local improvement operation", new LocalSearchImprovementOperator()));
       Parameters.Add(new ValueParameter<IShakingOperator>("Shaking", "The shaking operation"));
       Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of generations which should be processed.", new IntValue(1000)));
@@ -215 +215 @@
       if (Problem != null) {
         foreach (IIterationBasedOperator op in Problem.Operators.OfType<IIterationBasedOperator>()) {
-          op.IterationsParameter.ActualName = "OuterIterations";
+          op.IterationsParameter.ActualName = "Iterations";
           op.MaximumIterationsParameter.ActualName = "MaximumIterations";
         }
@@ -267 +267 @@
     }
     private void UpdateLocalImprovementOperator() {
-      LocalImprovementParameter.Value.Parameterize(Problem);
+      LocalImprovementParameter.Value.OnProblemChanged(Problem);
     }
     private void UpdateAnalyzers() {

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;

branches/VNS/HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj

@@ -124 +124 @@
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="SubScopesCloner.cs" />
     <Compile Include="SubScopesCounter.cs" />
     <Compile Include="SubScopesCreator.cs" />

branches/VNS/HeuristicLab.Operators/3.3/ScopeCleaner.cs

@@ -39 +39 @@
       get { return CurrentScopeParameter.ActualValue; }
     }
-    public ValueParameter<BoolValue> ClearSubScopesParameter {
-      get { return (ValueParameter<BoolValue>)Parameters["ClearSubScopes"]; }
-    }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserializationHook() {
-      #region Backwards Compatibility
-      if (!Parameters.ContainsKey("ClearSubScopes")) {
-        Parameters.Add(new ValueParameter<BoolValue>("ClearSubScopes", "Indicates, if the subscopes should be cleared.", new BoolValue(false)));
-      }
-      #endregion
-    }
 
     [StorableConstructor]
@@ -58 +46 @@
     }
     public ScopeCleaner()
-      : base() {
+      : base() { 
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope whose variables and sub-scopes should be removed."));
-      Parameters.Add(new ValueParameter<BoolValue>("ClearSubScopes", "Indicates, if the subscopes should be cleared.", new BoolValue(false)));
     }
 
@@ -69 +56 @@
     public override IOperation Apply() {
       CurrentScope.Variables.Clear();
-      if(ClearSubScopesParameter.Value.Value)
-        CurrentScope.SubScopes.Clear();
+      CurrentScope.SubScopes.Clear();
       return base.Apply();
     }

branches/VNS/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -116 +116 @@
     <Compile Include="Interfaces\IDiscreteDoubleMatrixModifier.cs" />
     <Compile Include="Interfaces\IGlobalParticleUpdater.cs" />
-    <Compile Include="Interfaces\ILocalImprovement.cs" />
+    <Compile Include="Interfaces\ILocalImprovementOperator.cs" />
     <Compile Include="Interfaces\ILocalParticleUpdater.cs" />
     <Compile Include="Interfaces\IMultiAnalyzer.cs" />

branches/VNS/HeuristicLab.Optimization/3.3/Interfaces/ILocalImprovementOperator.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Optimization {
-  public interface ILocalImprovement: IOperator {
-    void Parameterize(IProblem problem);
+  public interface ILocalImprovementOperator: IOperator {
+    void OnProblemChanged(IProblem problem);
   }
 }