Changeset 7778 for branches/ScatterSearch

Timestamp:

05/03/12 10:51:24 (13 years ago)

Author:

jkarder

Message:

#1331: added support for path relinking operators that use a multiple guiding strategy

Location:

branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3

Files:

• Knapsack/KnapsackMultipleGuidesPathRelinker.cs (modified) (1 diff)
• ScatterSearchMainLoop.cs (modified) (6 diffs)
• TravelingSalesman/TravelingSalesmanMultipleGuidesPathRelinker.cs (modified) (1 diff)

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

@@ -79 +79 @@
 
     protected override ItemArray<IItem> Relink(ItemArray<IItem> parents, PercentValue n) {
-      if (parents.Length != 2)
-        throw new ArgumentException("The number of parents is not equal to 2.");
+      if (parents.Length < 2)
+        throw new ArgumentException("The number of parents is smaller than 2.");
       return Apply(parents[0], parents.Skip(1).ToArray(), n);
     }

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

@@ -28 +28 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Selection;
 
 namespace HeuristicLab.Algorithms.ScatterSearch {
@@ -199 +200 @@
       ConditionalBranch terminateBranch = new ConditionalBranch();
       IntCounter interationsCounter = new IntCounter();
+      MergingReducer mergingReducer = new MergingReducer();
       OffspringProcessor offspringProcessor = new OffspringProcessor();
       Placeholder analyzer = new Placeholder();
@@ -209 +211 @@
       ResultsCollector resultsCollector = new ResultsCollector();
       ReferenceSetUpdateMethod referenceSetUpdateMethod = new ReferenceSetUpdateMethod();
+      RightSelector rightSelector = new RightSelector();
       SolutionPoolUpdateMethod solutionPoolUpdateMethod = new SolutionPoolUpdateMethod();
       SolutionsCreator solutionsCreator = new SolutionsCreator();
@@ -267 +270 @@
       interationsCounter.Successor = resultsCollector;
 
-      offspringProcessor.Successor = subScopesProcessor2;
+      offspringProcessor.Successor = rightSelector;
+
+      rightSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(1);
+      rightSelector.CopySelected = new BoolValue(false);
+      rightSelector.Successor = subScopesProcessor2;
 
       analyzer.Name = "Analyzer";
@@ -307 +314 @@
       subScopesProcessor2.DepthParameter.Value = new IntValue(1);
       subScopesProcessor2.Operators.Add(new EmptyOperator());
-      subScopesProcessor2.Operators.Add(new EmptyOperator());
       subScopesProcessor2.Operators.Add(uniformSubScopesProcessor2);
-      subScopesProcessor2.Successor = null;
+      subScopesProcessor2.Successor = mergingReducer;
 
       subScopesProcessor3.DepthParameter.Value = new IntValue(1);
@@ -320 +326 @@
       uniformSubScopesProcessor1.Successor = solutionPoolUpdateMethod;
 
-      uniformSubScopesProcessor2.DepthParameter.Value = new IntValue(1);
+      uniformSubScopesProcessor2.DepthParameter.Value = new IntValue(2);
       uniformSubScopesProcessor2.Operator = solutionImprover1;
       uniformSubScopesProcessor2.Successor = null;

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

@@ -123 +123 @@
 
     protected override ItemArray<IItem> Relink(ItemArray<IItem> parents, PercentValue n) {
-      if (parents.Length != 2)
-        throw new ArgumentException("The number of parents is not equal to 2.");
+      if (parents.Length < 2)
+        throw new ArgumentException("The number of parents is smaller than 2.");
       return Apply(parents[0], parents.Skip(1).ToArray(), DistanceMatrix, n);
     }