Changeset 7727 for branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

Timestamp:

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

Author:

jkarder

Message:

#1331:

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

File:

• branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (12 diffs)

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;
       }
     }