Changeset 7727 for branches/ScatterSearch

Timestamp:

04/13/12 18:42:59 (13 years ago)

Author:

jkarder

Message:

#1331:

• added custom improvement operator (ScatterSearchImprovementOperator)
• added parameters and adjusted types
• replaced improvement operators with placeholders
• changed access levels

Location:

branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3

Files:

• HeuristicLab.Algorithms.ScatterSearch-3.3.csproj (modified) (1 diff)
• ScatterSearch.cs (modified) (12 diffs)
• ScatterSearchImprovementOperator.cs (added)
• ScatterSearchMainLoop.cs (modified) (8 diffs)

branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/HeuristicLab.Algorithms.ScatterSearch-3.3.csproj

@@ -92 +92 @@
     <Compile Include="PopulationRebuildMethod.cs" />
     <Compile Include="ScatterSearch.cs" />
+    <Compile Include="ScatterSearchImprovementOperator.cs" />
     <Compile Include="ScatterSearchMainLoop.cs" />
     <Compile Include="SolutionCombinationMethod.cs" />

branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Algorithms.LocalSearch;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
@@ -60 +59 @@
       get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
     }
+    private ValueParameter<ILocalImprovementOperator> ImproverParameter {
+      get { return (ValueParameter<ILocalImprovementOperator>)Parameters["Improver"]; }
+    }
     private ValueParameter<IntValue> MaximumIterationsParameter {
       get { return (ValueParameter<IntValue>)Parameters["MaximumIterations"]; }
     }
-    public ConstrainedValueParameter<ISingleObjectiveMoveEvaluator> MoveEvaluatorParameter {
+    private ConstrainedValueParameter<ISingleObjectiveMoveEvaluator> MoveEvaluatorParameter {
       get { return (ConstrainedValueParameter<ISingleObjectiveMoveEvaluator>)Parameters["MoveEvaluator"]; }
     }
-    public ConstrainedValueParameter<IMoveGenerator> MoveGeneratorParameter {
+    private ConstrainedValueParameter<IMoveGenerator> MoveGeneratorParameter {
       get { return (ConstrainedValueParameter<IMoveGenerator>)Parameters["MoveGenerator"]; }
     }
-    public ConstrainedValueParameter<IMoveMaker> MoveMakerParameter {
+    private ConstrainedValueParameter<IMoveMaker> MoveMakerParameter {
       get { return (ConstrainedValueParameter<IMoveMaker>)Parameters["MoveMaker"]; }
     }
@@ -106 +108 @@
       set { AnalyzerParameter.Value = value; }
     }
+    public ILocalImprovementOperator Improver {
+      get { return ImproverParameter.Value; }
+      set { ImproverParameter.Value = value; }
+    }
     public IntValue MaximumIterations {
       get { return MaximumIterationsParameter.Value; }
@@ -148 +154 @@
 
     [Storable]
-    private BestAverageWorstQualityAnalyzer moveQualityAnalyzer;
+    private BestAverageWorstQualityAnalyzer qualityAnalyzer;
     #endregion
 
@@ -159 +165 @@
     private ScatterSearch(ScatterSearch original, Cloner cloner)
       : base(original, cloner) {
-      moveQualityAnalyzer = cloner.Clone(original.moveQualityAnalyzer);
+      qualityAnalyzer = cloner.Clone(original.qualityAnalyzer);
       Initialize();
     }
@@ -169 +175 @@
       #region Create parameters
       Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze the solution and moves.", new MultiAnalyzer()));
-      Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of generations which should be processed.", new IntValue(5)));
+      Parameters.Add(new ValueParameter<ILocalImprovementOperator>("Improver", "The operator used to improve solutions.", new ScatterSearchImprovementOperator()));
+      Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of generations which should be processed.", new IntValue(1000)));
       Parameters.Add(new ConstrainedValueParameter<ISingleObjectiveMoveEvaluator>("MoveEvaluator", "The operator used to evaluate a move."));
       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 ValueParameter<IntValue>("NumberOfHighQualitySolutions", "The number of high quality solutions that should be added to the reference set.", new IntValue(6)));
+      Parameters.Add(new ValueParameter<IntValue>("NumberOfHighQualitySolutions", "The number of high quality solutions that should be added to the reference set.", new IntValue(5)));
       Parameters.Add(new ValueParameter<IntValue>("PopulationSize", "The size of the population.", new IntValue(30)));
       Parameters.Add(new ValueParameter<IntValue>("ReferenceSetSize", "The size of the reference set.", new IntValue(10)));
@@ -185 +192 @@
       SolutionsCreator solutionsCreator = new SolutionsCreator();
       UniformSubScopesProcessor uniformSubScopesProcessor = new UniformSubScopesProcessor();
-      LocalSearchImprovementOperator localImprovementOperator = new LocalSearchImprovementOperator();
+      Placeholder solutionEvaluator = new Placeholder();
+      Placeholder solutionImprover = new Placeholder();
       BestSelector bestSelector = new BestSelector();
       VariableCreator variableCreator = new VariableCreator();
@@ -203 +211 @@
       solutionsCreator.Successor = uniformSubScopesProcessor;
 
-      uniformSubScopesProcessor.Operator = localImprovementOperator;
+      uniformSubScopesProcessor.Operator = solutionImprover;
       uniformSubScopesProcessor.Successor = bestSelector;
 
-      localImprovementOperator.Name = "ImprovementMethod";
-      localImprovementOperator.MaximumIterationsParameter.ActualName = MaximumIterationsParameter.Name;
-      localImprovementOperator.SampleSizeParameter.ActualName = SampleSizeParameter.Name;
-      localImprovementOperator.Successor = null;
+      solutionImprover.Name = "SolutionImprover";
+      solutionImprover.OperatorParameter.ActualName = "Improver";
+      solutionImprover.Successor = solutionEvaluator;
+
+      solutionEvaluator.Name = "SolutionEvaluator";
+      solutionEvaluator.OperatorParameter.ActualName = "Evaluator";
+      solutionEvaluator.Successor = null;
 
       bestSelector.NumberOfSelectedSubScopesParameter.ActualName = NumberOfHighQualitySolutionsParameter.Name;
@@ -233 +244 @@
       #endregion
 
-      moveQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
       ParameterizeAnalyzers();
       UpdateAnalyzers();
@@ -318 +329 @@
       ParameterizeMoveEvaluators();
       ParameterizeMoveMakers();
-      ParameterizeAnalyzers();
     }
     #endregion
@@ -397 +407 @@
         }
       }
-      Analyzer.Operators.Add(moveQualityAnalyzer, moveQualityAnalyzer.EnabledByDefault);
+      Analyzer.Operators.Add(qualityAnalyzer, qualityAnalyzer.EnabledByDefault);
     }
     private void ClearMoveParameters() {
@@ -450 +460 @@
     }
     private void ParameterizeAnalyzers() {
-      moveQualityAnalyzer.ResultsParameter.ActualName = "Results";
-      moveQualityAnalyzer.ResultsParameter.Hidden = true;
-      if (Problem != null) {
-        moveQualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
-        moveQualityAnalyzer.MaximizationParameter.Hidden = true;
+      qualityAnalyzer.ResultsParameter.ActualName = "Results";
+      qualityAnalyzer.ResultsParameter.Hidden = true;
+      if (Problem != null) {
+        qualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
+        qualityAnalyzer.MaximizationParameter.Hidden = true;
         if (MoveEvaluator != null) {
-          moveQualityAnalyzer.QualityParameter.ActualName = MoveEvaluator.MoveQualityParameter.ActualName;
-          moveQualityAnalyzer.QualityParameter.Hidden = true;
-        } else moveQualityAnalyzer.QualityParameter.Hidden = false;
-        moveQualityAnalyzer.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name;
-        moveQualityAnalyzer.BestKnownQualityParameter.Hidden = true;
+          qualityAnalyzer.QualityParameter.Hidden = true;
+        } else qualityAnalyzer.QualityParameter.Hidden = false;
+        qualityAnalyzer.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name;
+        qualityAnalyzer.BestKnownQualityParameter.Hidden = true;
       } else {
-        moveQualityAnalyzer.MaximizationParameter.Hidden = false;
-        moveQualityAnalyzer.BestKnownQualityParameter.Hidden = false;
+        qualityAnalyzer.MaximizationParameter.Hidden = false;
+        qualityAnalyzer.BestKnownQualityParameter.Hidden = false;
       }
     }

branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Algorithms.LocalSearch;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -74 +73 @@
       get { return (LookupParameter<VariableCollection>)Parameters["Results"]; }
     }
-    internal LookupParameter<IOperator> MoveEvaluatorParameter {
-      get { return (LookupParameter<IOperator>)Parameters["MoveEvaluator"]; }
-    }
-    internal LookupParameter<IOperator> MoveGeneratorParameter {
-      get { return (LookupParameter<IOperator>)Parameters["MoveGenerator"]; }
-    }
-    internal LookupParameter<IOperator> MoveMakerParameter {
-      get { return (LookupParameter<IOperator>)Parameters["MoveMaker"]; }
+    internal LookupParameter<ISingleObjectiveMoveEvaluator> MoveEvaluatorParameter {
+      get { return (LookupParameter<ISingleObjectiveMoveEvaluator>)Parameters["MoveEvaluator"]; }
+    }
+    internal LookupParameter<IMoveGenerator> MoveGeneratorParameter {
+      get { return (LookupParameter<IMoveGenerator>)Parameters["MoveGenerator"]; }
+    }
+    internal LookupParameter<IMoveMaker> MoveMakerParameter {
+      get { return (LookupParameter<IMoveMaker>)Parameters["MoveMaker"]; }
+    }
+    internal LookupParameter<IOperator> ImproverParameter {
+      get { return (LookupParameter<IOperator>)Parameters["Improver"]; }
+    }
+    internal LookupParameter<IOperator> EvaluatorParameter {
+      get { return (LookupParameter<IOperator>)Parameters["Evaluator"]; }
     }
     internal LookupParameter<IMultiAnalyzer> AnalyzerParameter {
@@ -137 +142 @@
       set { ResultsParameter.ActualValue = value; }
     }
-    public IOperator MoveEvaluator {
+    public ISingleObjectiveMoveEvaluator MoveEvaluator {
       get { return MoveEvaluatorParameter.ActualValue; }
       set { MoveEvaluatorParameter.ActualValue = value; }
     }
-    public IOperator MoveGenerator {
+    public IMoveGenerator MoveGenerator {
       get { return MoveGeneratorParameter.ActualValue; }
       set { MoveGeneratorParameter.ActualValue = value; }
     }
-    public IOperator MoveMaker {
+    public IMoveMaker MoveMaker {
       get { return MoveMakerParameter.ActualValue; }
       set { MoveMakerParameter.ActualValue = value; }
+    }
+    public IOperator Improver {
+      get { return ImproverParameter.ActualValue; }
+      set { ImproverParameter.ActualValue = value; }
+    }
+    public IOperator Evaluator {
+      get { return EvaluatorParameter.ActualValue; }
+      set { EvaluatorParameter.ActualValue = value; }
     }
     public IMultiAnalyzer Analyzer {
@@ -178 +191 @@
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The value which represents the quality of a move."));
       Parameters.Add(new LookupParameter<IOperator>("SolutionCreator", "The operator which is used to create new solutions."));
-      Parameters.Add(new LookupParameter<IOperator>("Evaluator", "The operator which is used to evaluate new solutions. This operator is executed in parallel, if an engine is used which supports parallelization."));
-      Parameters.Add(new LookupParameter<IOperator>("Improver", "The operator which is used to improve new solutions. This operator is executed in parallelm, if an engine is used which supports parallelization."));
+      Parameters.Add(new LookupParameter<IOperator>("Evaluator", "The operator which is used to evaluate new solutions."));
       Parameters.Add(new LookupParameter<VariableCollection>("Results", "The variable collection where results should be stored."));
-      Parameters.Add(new LookupParameter<IOperator>("MoveGenerator", "The operator that generates the moves."));
-      Parameters.Add(new LookupParameter<IOperator>("MoveMaker", "The operator that performs a move and updates the quality."));
-      Parameters.Add(new LookupParameter<IOperator>("MoveEvaluator", "The operator that evaluates a move."));
+      Parameters.Add(new LookupParameter<ISingleObjectiveMoveEvaluator>("MoveEvaluator", "The operator used to evaluate a move."));
+      Parameters.Add(new LookupParameter<IMoveGenerator>("MoveGenerator", "The operator that generates the moves."));
+      Parameters.Add(new LookupParameter<IMoveMaker>("MoveMaker", "The operator that performs a move and updates the quality."));
+      Parameters.Add(new LookupParameter<IOperator>("Improver", "The operator used to improve solutions."));
       Parameters.Add(new LookupParameter<IMultiAnalyzer>("Analyzer", "The operator used to analyze the solution and moves."));
       #endregion
@@ -195 +208 @@
       ConditionalBranch terminateBranch = new ConditionalBranch();
       IntCounter interationsCounter = new IntCounter();
-      LocalSearchImprovementOperator localImprovementOperator = new LocalSearchImprovementOperator();
       Placeholder analyzer = new Placeholder();
-      Placeholder solutionImprover = new Placeholder();
-      Placeholder solutionEvaluator = new Placeholder();
+      Placeholder solutionEvaluator1 = new Placeholder();
+      Placeholder solutionEvaluator2 = new Placeholder();
+      Placeholder solutionImprover1 = new Placeholder();
+      Placeholder solutionImprover2 = new Placeholder();
       PopulationRebuildMethod populationRebuildMethod = new PopulationRebuildMethod();
       ResultsCollector resultsCollector = new ResultsCollector();
@@ -236 +250 @@
       iterationsChecker.Successor = terminateBranch;
 
-      localImprovementOperator.Name = "ImprovementMethod";
-      localImprovementOperator.MaximumIterationsParameter.ActualName = MaximumIterationsParameter.Name;
-      localImprovementOperator.SampleSizeParameter.ActualName = SampleSizeParameter.Name;
-      localImprovementOperator.Successor = null;
+      solutionImprover2.Name = "SolutionImprover";
+      solutionImprover2.OperatorParameter.ActualName = "Improver";
+      solutionImprover2.Successor = solutionEvaluator2;
+
+      solutionEvaluator2.Name = "SolutionEvaluator";
+      solutionEvaluator2.OperatorParameter.ActualName = "Evaluator";
+      solutionEvaluator2.Successor = null;
 
       newSolutionsBranch.Name = "NewSolutionChecker";
@@ -261 +278 @@
       analyzer.OperatorParameter.ActualName = "Analyzer";
 
-      solutionImprover.Name = "SolutionImprover";
-      solutionImprover.OperatorParameter.ActualName = "LocalImprovementOperator";
-      solutionImprover.Successor = solutionEvaluator;
-
-      solutionEvaluator.Name = "SolutionEvaluator";
-      solutionEvaluator.OperatorParameter.ActualName = "Evaluator";
-      solutionEvaluator.Successor = null;
+      solutionImprover1.Name = "SolutionImprover";
+      solutionImprover1.OperatorParameter.ActualName = "Improver";
+      solutionImprover1.Successor = solutionEvaluator1;
+
+      solutionEvaluator1.Name = "SolutionEvaluator";
+      solutionEvaluator1.OperatorParameter.ActualName = "Evaluator";
+      solutionEvaluator1.Successor = null;
 
       populationRebuildMethod.Successor = subScopesProcessor3;
@@ -308 +325 @@
 
       uniformSubScopesProcessor2.DepthParameter.Value = new IntValue(1);
-      uniformSubScopesProcessor2.Operator = solutionImprover;
+      uniformSubScopesProcessor2.Operator = solutionImprover1;
       uniformSubScopesProcessor2.Successor = null;
 
       uniformSubScopesProcessor3.DepthParameter.Value = new IntValue(1);
-      uniformSubScopesProcessor3.Operator = localImprovementOperator;
+      uniformSubScopesProcessor3.Operator = solutionImprover2;
       uniformSubScopesProcessor3.Successor = null;
       #endregion