Changeset 7756

Timestamp:

04/24/12 14:22:32 (12 years ago)

Author:

jkarder

Message:

#1331:

• added path relinking and problem specific operators (KnapsackPathRelinker, TravelingSalesmanPathRelinker) for it
• adjusted event handling
• minor code improvements

Location:

branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3

Files:

• HeuristicLab.Algorithms.ScatterSearch-3.3.csproj (modified) (1 diff)
• IPathRelinker.cs (added)
• Knapsack/BinaryVectorDiversityCalculator.cs (modified) (1 diff)
• Knapsack/KnapsackImprovementOperator.cs (modified) (1 diff)
• Knapsack/KnapsackPathRelinker.cs (added)
• Knapsack/NBinaryVectorCrossover.cs (modified) (1 diff)
• Knapsack/NChildCrossover.cs (modified) (1 diff)
• PathRelinker.cs (added)
• ScatterSearch.cs (modified) (1 diff)
• TravelingSalesman/PermutationDiversityCalculator.cs (modified) (1 diff)
• TravelingSalesman/TravelingSalesmanImprovementOperator.cs (modified) (5 diffs)
• TravelingSalesman/TravelingSalesmanPathRelinker.cs (added)

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

@@ -87 +87 @@
   <ItemGroup>
     <Compile Include="DiversityCalculator.cs" />
+    <Compile Include="IPathRelinker.cs" />
     <Compile Include="Knapsack\BinaryVectorDiversityCalculator.cs" />
+    <Compile Include="Knapsack\KnapsackPathRelinker.cs" />
+    <Compile Include="TravelingSalesman\TravelingSalesmanPathRelinker.cs" />
+    <Compile Include="PathRelinker.cs" />
     <Compile Include="Knapsack\INBinaryVectorCrossover.cs" />
     <Compile Include="IScatterSearchTargetProcessor.cs" />

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

@@ -31 +31 @@
   [Item("BinaryVectorDiversityCalculator", "An operator that performs diversity calculation between bool-valued vectors.")]
   [StorableClass]
-  public sealed class BinaryVectorDiversityCalculator : HeuristicLab.Algorithms.ScatterSearch.DiversityCalculator {
+  public sealed class BinaryVectorDiversityCalculator : DiversityCalculator {
     [StorableConstructor]
     private BinaryVectorDiversityCalculator(bool deserializing) : base(deserializing) { }

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

@@ -39 +39 @@
   [StorableClass]
   public sealed class KnapsackImprovementOperator : SingleSuccessorOperator, ILocalImprovementOperator, IScatterSearchTargetProcessor {
-
     #region Problem properties
     public Type ProblemType {

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

@@ -64 +64 @@
       #region Create parameters
       Parameters.Add(new ScopeParameter("CurrentScope"));
-      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic crossover operators."));
-      Parameters.Add(new ScopeTreeLookupParameter<BinaryVector>("Parents", "The parent vectors which should be crossed."));
+      Parameters.Add(new LookupParameter<IRandom>("Random"));
+      Parameters.Add(new ScopeTreeLookupParameter<BinaryVector>("Parents"));
       #endregion
       ParentsParameter.ActualName = "BinaryVector";

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

@@ -78 +78 @@
 
     protected override ItemArray<BinaryVector> Cross(IRandom random, ItemArray<BinaryVector> parents) {
-      if (parents.Length != 2) throw new ArgumentException("ERROR in NChildCrossover: The number of parents is not equal to 2");
+      if (parents.Length != 2) throw new ArgumentException("NChildCrossover: The number of parents is not equal to 2.");
 
       if (NParameter.ActualValue == null) throw new InvalidOperationException("NChildCrossover: Parameter " + NParameter.ActualName + " could not be found.");

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

@@ -306 +306 @@
       ICrossover defaultCrossover = Problem.Operators.OfType<ICrossover>().FirstOrDefault();
 
+      CrossoverParameter.ValidValues.Add(new TravelingSalesman.TravelingSalesmanPathRelinker());
+      CrossoverParameter.ValidValues.Add(new Knapsack.KnapsackPathRelinker());
+
       foreach (ICrossover crossover in Problem.Operators.OfType<ICrossover>().OrderBy(x => x.Name))
         CrossoverParameter.ValidValues.Add(crossover);

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

@@ -32 +32 @@
   [Item("PermutationDiversityCalculator", "An operator that performs diversity calculation between permutations.")]
   [StorableClass]
-  public sealed class PermutationDiversityCalculator : HeuristicLab.Algorithms.ScatterSearch.DiversityCalculator {
+  public sealed class PermutationDiversityCalculator : DiversityCalculator {
     [StorableConstructor]
     private PermutationDiversityCalculator(bool deserializing) : base(deserializing) { }

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

@@ -39 +39 @@
   [StorableClass]
   public sealed class TravelingSalesmanImprovementOperator : SingleSuccessorOperator, ILocalImprovementOperator, IScatterSearchTargetProcessor {
-
     #region Problem properties
     public Type ProblemType {
@@ -62 +61 @@
       get { return (IValueLookupParameter<IEvaluator>)Parameters["Evaluator"]; }
     }
-    public IValueLookupParameter<IntValue> ImprovementIterationsParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["ImprovementIterations"]; }
+    public IValueLookupParameter<IntValue> ImprovementAttemptsParameter {
+      get { return (IValueLookupParameter<IntValue>)Parameters["ImprovementAttempts"]; }
     }
     public IValueLookupParameter<IRandom> RandomParameter {
@@ -96 +95 @@
       set { EvaluatorParameter.ActualValue = value; }
     }
-    public IntValue ImprovementIterations {
-      get { return ImprovementIterationsParameter.ActualValue; }
-      set { ImprovementIterationsParameter.ActualValue = value; }
+    public IntValue ImprovementAttempts {
+      get { return ImprovementAttemptsParameter.ActualValue; }
+      set { ImprovementAttemptsParameter.ActualValue = value; }
     }
     public IRandom Random {
@@ -118 +117 @@
       : base() {
       #region Create parameters
-      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope."));
-      Parameters.Add(new ValueLookupParameter<DoubleMatrix>("Coordinates", "The coordinates of the cities."));
-      Parameters.Add(new ValueLookupParameter<IEvaluator>("Evaluator", "The operator which is used to evaluate new solutions."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("ImprovementIterations", "The number of improvement attempts."));
-      Parameters.Add(new ValueLookupParameter<IRandom>("Random", "..."));
+      Parameters.Add(new ScopeParameter("CurrentScope"));
+      Parameters.Add(new ValueLookupParameter<DoubleMatrix>("Coordinates"));
+      Parameters.Add(new ValueLookupParameter<IEvaluator>("Evaluator"));
+      Parameters.Add(new ValueLookupParameter<IntValue>("ImprovementAttempts", new IntValue(100)));
+      Parameters.Add(new ValueLookupParameter<IRandom>("Random"));
       Parameters.Add(new ValueLookupParameter<IItem>("Target"));
       #endregion
@@ -138 +137 @@
       double bestLength = currLength;
 
-      for (int i = 0; i < ImprovementIterations.Value; i++) {
+      for (int i = 0; i < ImprovementAttempts.Value; i++) {
         int a = Random.Next(currSol.Length - 1);
         int b = Random.Next(currSol.Length - 1);