Changeset 7786 for branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/Knapsack/KnapsackImprovementOperator.cs

Timestamp:

05/09/12 12:22:33 (12 years ago)

Author:

jkarder

Message:

#1331:

• fixed bug in path relinking selection
• fixed bug in ScatterSearch.Prepare()
• added custom interface (IImprovementOperator) for Scatter Search specific improvement operators
• switched from diversity calculation to similarity calculation
• separated IPathRelinker from ICrossover
• changed TestFunctionsImprovementOperator to use reflection for evaluating functions
• changed SolutionPoolUpdateMethod to use similarity calculation for solution comparison
• improved TravelingSalesmanImprovementOperator
• improved operator graph
• removed specific operators used to evaluate TestFunctions problems
• removed custom crossover operator (NChildCrossover)
• added parameters and adjusted types
• adjusted event handling
• changed access levels
• minor code improvements

File:

• branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/Knapsack/KnapsackImprovementOperator.cs (modified) (6 diffs)

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

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Linq;
 using HeuristicLab.Common;
@@ -27 +26 @@
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -38 +36 @@
   [Item("KnapsackImprovementOperator", "An operator that improves knapsack solutions.")]
   [StorableClass]
-  public sealed class KnapsackImprovementOperator : SingleSuccessorOperator, ILocalImprovementOperator, IScatterSearchTargetProcessor {
-    #region Problem properties
-    public Type ProblemType {
-      get { return typeof(KnapsackProblem); }
-    }
-    [Storable]
-    private KnapsackProblem problem;
-    public IProblem Problem {
-      get { return problem; }
-      set { problem = (KnapsackProblem)value; }
-    }
-    #endregion
-
+  public sealed class KnapsackImprovementOperator : SingleSuccessorOperator, IImprovementOperator {
     #region Parameter properties
     public ScopeParameter CurrentScopeParameter {
       get { return (ScopeParameter)Parameters["CurrentScope"]; }
     }
-    public IValueLookupParameter<IntArray> ValuesParameter {
-      get { return (IValueLookupParameter<IntArray>)Parameters["Values"]; }
+    public ILookupParameter<IntValue> KnapsackCapacityParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["KnapsackCapacity"]; }
     }
-    public IValueLookupParameter<IntArray> WeightsParameter {
-      get { return (IValueLookupParameter<IntArray>)Parameters["Weights"]; }
-    }
-    public IValueLookupParameter<IntValue> KnapsackCapacityParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["KnapsackCapacity"]; }
+    public ILookupParameter<DoubleValue> PenaltyParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["Penalty"]; }
     }
     public IValueLookupParameter<IItem> TargetParameter {
       get { return (IValueLookupParameter<IItem>)Parameters["Target"]; }
     }
-    public IValueLookupParameter<DoubleValue> PenaltyParameter {
-      get { return (IValueLookupParameter<DoubleValue>)Parameters["Penalty"]; }
+    public ILookupParameter<IntArray> ValuesParameter {
+      get { return (ILookupParameter<IntArray>)Parameters["Values"]; }
     }
-    #region ILocalImprovementOperator Parameters
-    public IValueLookupParameter<IntValue> MaximumIterationsParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["MaximumIterations"]; }
+    public ILookupParameter<IntArray> WeightsParameter {
+      get { return (ILookupParameter<IntArray>)Parameters["Weights"]; }
     }
-    public ILookupParameter<IntValue> EvaluatedSolutionsParameter {
-      get { return (ILookupParameter<IntValue>)Parameters["EvaluatedSolutions"]; }
-    }
-    public ILookupParameter<ResultCollection> ResultsParameter {
-      get { return (ILookupParameter<ResultCollection>)Parameters["Results"]; }
-    }
-    #endregion
     #endregion
 
@@ -86 +61 @@
     private IScope CurrentScope {
       get { return CurrentScopeParameter.ActualValue; }
+    }
+    private IntValue KnapsackCapacity {
+      get { return KnapsackCapacityParameter.ActualValue; }
+      set { KnapsackCapacityParameter.ActualValue = value; }
+    }
+    private DoubleValue Penalty {
+      get { return PenaltyParameter.ActualValue; }
+      set { PenaltyParameter.ActualValue = value; }
+    }
+    private IItem Target {
+      get { return TargetParameter.ActualValue; }
     }
     private IntArray Values {
@@ -95 +81 @@
       set { WeightsParameter.ActualValue = value; }
     }
-    private IntValue KnapsackCapacity {
-      get { return KnapsackCapacityParameter.ActualValue; }
-      set { KnapsackCapacityParameter.ActualValue = value; }
-    }
-    private IItem Target {
-      get { return TargetParameter.ActualValue; }
-    }
-    private DoubleValue Penalty {
-      get { return PenaltyParameter.ActualValue; }
-      set { PenaltyParameter.ActualValue = value; }
-    }
     #endregion
 
     [StorableConstructor]
     private KnapsackImprovementOperator(bool deserializing) : base(deserializing) { }
-    private KnapsackImprovementOperator(KnapsackImprovementOperator original, Cloner cloner)
-      : base(original, cloner) {
-      this.problem = cloner.Clone(original.problem);
-    }
+    private KnapsackImprovementOperator(KnapsackImprovementOperator original, Cloner cloner) : base(original, cloner) { }
     public KnapsackImprovementOperator()
       : base() {
       #region Create parameters
       Parameters.Add(new ScopeParameter("CurrentScope"));
-      Parameters.Add(new ValueLookupParameter<IntArray>("Values"));
-      Parameters.Add(new ValueLookupParameter<IntArray>("Weights"));
-      Parameters.Add(new ValueLookupParameter<IntValue>("KnapsackCapacity"));
+      Parameters.Add(new LookupParameter<IntValue>("KnapsackCapacity"));
+      Parameters.Add(new LookupParameter<DoubleValue>("Penalty"));
       Parameters.Add(new ValueLookupParameter<IItem>("Target"));
-      Parameters.Add(new ValueLookupParameter<DoubleValue>("Penalty"));
+      Parameters.Add(new LookupParameter<IntArray>("Values"));
+      Parameters.Add(new LookupParameter<IntArray>("Weights"));
       #endregion
       TargetParameter.ActualName = "KnapsackSolution"; // temporary solution for the knapsack problem
@@ -132 +104 @@
 
     public override IOperation Apply() {
-      var sol = CurrentScope.Variables[TargetParameter.ActualName].Value as BinaryVector;
+      BinaryVector sol = CurrentScope.Variables[TargetParameter.ActualName].Value as BinaryVector;
 
       // calculate value-to-weight ratio