Changeset 8319 for branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.Knapsack/3.3/SimilarityCalculators/KnapsackSimilarityCalculator.cs

Timestamp:

07/24/12 15:04:37 (12 years ago)

Author:

jkarder

Message:

#1331:

• applied some of the changes suggested by ascheibe in comment:32:ticket:1331
• restructured path relinking and improvement operators and similarity calculators
• fixed bug in TSPMultipleGuidesPathRelinker

File:

• branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.Knapsack/3.3/SimilarityCalculators/KnapsackSimilarityCalculator.cs (modified) (3 diffs)

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.Knapsack/3.3/SimilarityCalculators/KnapsackSimilarityCalculator.cs

@@ -30 +30 @@
   /// An operator that performs similarity calculation between two knapsack solutions.
   /// </summary>
+  /// <remarks>
+  /// The operator calculates the similarity based on the number of elements the two solutions have in common.
+  /// </remarks>
   [Item("KnapsackSimilarityCalculator", "An operator that performs similarity calculation between two knapsack solutions.")]
-  public sealed class KnapsackSimilarityCalculator : SimilarityCalculator {
+  public sealed class KnapsackSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
     private KnapsackSimilarityCalculator(bool deserializing) : base(deserializing) { }
     private KnapsackSimilarityCalculator(KnapsackSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
@@ -43 +46 @@
       if (left == null || right == null)
         throw new ArgumentException("Cannot calculate diversity because one or both of the provided scopes is null.");
+      if (left.Length != right.Length)
+        throw new ArgumentException("Cannot calculate similarity because the provided solutions have different lengths.");
       if (left == right) return 1.0;
 
@@ -51 +56 @@
     }
 
-    public override double CalculateIndividualSimilarity(IScope left, IScope right) {
-      var sol1 = left.Variables[Target].Value as BinaryVector;
-      var sol2 = right.Variables[Target].Value as BinaryVector;
+    public override double CalculateSolutionSimilarity(IScope leftSolution, IScope rightSolution) {
+      var sol1 = leftSolution.Variables[SolutionVariableName].Value as BinaryVector;
+      var sol2 = rightSolution.Variables[SolutionVariableName].Value as BinaryVector;
 
       return CalculateSimilarity(sol1, sol2);