Changeset 7478 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinking.cs

Timestamp:

02/16/12 16:00:07 (13 years ago)

Author:

abeham

Message:

#1614: simplified GRASP+PR operator graph, replaced IMerger with an IPopulationReducer

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinking.cs (modified) (9 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinking.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -79 +80 @@
       get { return (ConstrainedValueParameter<ICrossover>)Parameters["PathRelinking"]; }
     }
-    public ConstrainedValueParameter<IMerger> EliteSetMergerParameter {
-      get { return (ConstrainedValueParameter<IMerger>)Parameters["EliteSetMerger"]; }
+    public ConstrainedValueParameter<IPopulationReducer> EliteSetReducerParameter {
+      get { return (ConstrainedValueParameter<IPopulationReducer>)Parameters["EliteSetReducer"]; }
     }
     #endregion
@@ -109 +110 @@
       get { return (RandomCreator)OperatorGraph.InitialOperator; }
     }
+    private SolutionsCreator SolutionsCreator {
+      get { return (SolutionsCreator)RandomCreator.Successor; }
+    }
     private GRASPWithPathRelinkingMainLoop MainLoop {
-      get { return RandomCreator.Successor as GRASPWithPathRelinkingMainLoop; }
+      get { return SolutionsCreator.Successor as GRASPWithPathRelinkingMainLoop; }
     }
     #endregion
@@ -135 +139 @@
       Parameters.Add(new FixedValueParameter<IntValue>("MinimumEliteSetSize", "(ρ) The minimum amount of elites for performing path relinking.", new IntValue(2)));
       Parameters.Add(new ConstrainedValueParameter<ICrossover>("PathRelinking", "The operator that performs the path relinking."));
-      Parameters.Add(new ConstrainedValueParameter<IMerger>("EliteSetMerger", "The operator that merges new solutions into the elite set."));
+      Parameters.Add(new ConstrainedValueParameter<IPopulationReducer>("EliteSetReducer", "The operator that reduces the old elite set and the new solution(s) to a new elite set."));
 
       analyzer = new BestAverageWorstQualityAnalyzer();
       Analyzer.Operators.Add(analyzer);
 
-      RandomCreator randomCreator = new RandomCreator();
+      var randomCreator = new RandomCreator();
       OperatorGraph.InitialOperator = randomCreator;
 
@@ -149 +153 @@
       randomCreator.SetSeedRandomlyParameter.Value = null;
 
+      var solutionsCreator = new SolutionsCreator();
+      solutionsCreator.NumberOfSolutionsParameter.ActualName = MinimumEliteSetSizeParameter.Name;
+      solutionsCreator.ParallelParameter.Value = new BoolValue(true);
+      randomCreator.Successor = solutionsCreator;
+
       var mainLoop = new GRASPWithPathRelinkingMainLoop();
       mainLoop.AnalyzerParameter.ActualName = AnalyzerParameter.Name;
-      mainLoop.EliteSetMergerParameter.ActualName = EliteSetMergerParameter.Name;
+      mainLoop.EliteSetReducerParameter.ActualName = EliteSetReducerParameter.Name;
       mainLoop.EliteSetSizeParameter.ActualName = EliteSetSizeParameter.Name;
       mainLoop.EvaluatedSolutionsParameter.ActualName = "EvaluatedSolutions";
@@ -158 +167 @@
       mainLoop.PathRelinkingParameter.ActualName = PathRelinkingParameter.Name;
       mainLoop.ResultsParameter.ActualName = "Results";
-      randomCreator.Successor = mainLoop;
+      solutionsCreator.Successor = mainLoop;
 
       InitializeOperators();
@@ -219 +228 @@
         InitializeFromInstallation(LocalImprovementParameter, x => x.ProblemType.IsAssignableFrom(Problem.GetType()));
         InitializeFromProblem(PathRelinkingParameter);
-        InitializeFromProblem(EliteSetMergerParameter);
+        InitializeFromProblem(EliteSetReducerParameter);
       } else {
         LocalImprovementParameter.ValidValues.Clear();
         PathRelinkingParameter.ValidValues.Clear();
-        EliteSetMergerParameter.ValidValues.Clear();
+        EliteSetReducerParameter.ValidValues.Clear();
       }
       Analyzer.Operators.Add(analyzer);
@@ -232 +241 @@
     private void Parameterize() {
       if (Problem != null) {
+        SolutionsCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
+        SolutionsCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
+
         MainLoop.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
         MainLoop.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
@@ -245 +257 @@
         localImprovement.ResultsParameter.ActualName = "Results";
       }
-      foreach (var merger in EliteSetMergerParameter.ValidValues) {
-        merger.PopulationSizeParameter.ActualName = EliteSetSizeParameter.Name;
+      foreach (var reducer in EliteSetReducerParameter.ValidValues) {
+        reducer.MinimumPopulationSizeParameter.ActualName = MinimumEliteSetSizeParameter.Name;
+        reducer.MaximumPopulationSizeParameter.ActualName = EliteSetSizeParameter.Name;
       }
     }