Changeset 7756 for branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/Knapsack

Timestamp:

04/24/12 14:22:32 (13 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/Knapsack

Files:

• BinaryVectorDiversityCalculator.cs (modified) (1 diff)
• KnapsackImprovementOperator.cs (modified) (1 diff)
• KnapsackPathRelinker.cs (added)
• NBinaryVectorCrossover.cs (modified) (1 diff)
• NChildCrossover.cs (modified) (1 diff)

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.");