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

Timestamp:

04/20/12 17:00:09 (13 years ago)

Author:

jkarder

Message:

#1331:

• added problem specific improvement operators (KnapsackImprovementOperator, TravelingSalesmanImprovementOperator)
• added custom interface (IScatterSearchTargetProcessor) for Scatter Search specific operators that use a target parameter
• added custom operator (OffspringProcessor) to process multiple children that were created by crossovers
• extracted diversity calculation and added problem/encoding specific operators (BinaryVectorDiversityCalculator, PermutationDiversityCalculator) for it
• added parameters and adjusted types
• adjusted event handling
• minor code improvements

Location:

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

Files:

• BinaryVectorDiversityCalculator.cs (added)
• DiversityCalculator.cs (deleted)
• KnapsackImprovementOperator.cs (added)
• NBinaryVectorCrossover.cs (modified) (1 diff)
• NChildCrossover.cs (modified) (3 diffs)

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

@@ -71 +71 @@
 
     public sealed override IOperation Apply() {
-      //ChildrenParameter.ActualValue = Cross(RandomParameter.ActualValue, ParentsParameter.ActualValue);
       var offspringSolutions = Cross(RandomParameter.ActualValue, ParentsParameter.ActualValue);
       for (int i = 0; i < offspringSolutions.Length; i++) {

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

@@ -35 +35 @@
   [StorableClass]
   public sealed class NChildCrossover : NBinaryVectorCrossover {
+    #region Parameter properties
     public IValueLookupParameter<IntValue> NParameter {
       get { return (IValueLookupParameter<IntValue>)Parameters["N"]; }
     }
+    #endregion
 
     [StorableConstructor]
@@ -44 +46 @@
     public NChildCrossover()
       : base() {
+      #region Create parameters
       Parameters.Add(new ValueLookupParameter<IntValue>("N", "Number of children.", new IntValue(2)));
+      #endregion
     }
 
@@ -53 +57 @@
     public static ItemArray<BinaryVector> Apply(IRandom random, BinaryVector parent1, BinaryVector parent2, IntValue n) {
       if (parent1.Length != parent2.Length)
-        throw new ArgumentException("NPointCrossover: The parents are of different length.");
+        throw new ArgumentException("NChildCrossover: The parents are of different length.");
 
       if (n.Value > Math.Pow(2, parent1.Length) - 2)
-        throw new ArgumentException("NPointCrossover: There cannot be more breakpoints than the size of the parents.");
+        throw new ArgumentException("NChildCrossover: There cannot be more children than 2^size of parents - 2.");
 
       if (n.Value < 1)
-        throw new ArgumentException("NPointCrossover: N cannot be < 1.");
+        throw new ArgumentException("NChildCrossover: N cannot be < 1.");
 
       var solutions = new BinaryVector[n.Value];