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

Timestamp:

07/19/12 13:19:12 (12 years ago)

Author:

jkarder

Message:

#1331: added support for similarity calculation between multiple individuals

File:

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

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

@@ -42 +42 @@
     public static double CalculateSimilarity(BinaryVector left, BinaryVector right) {
       if (left == null || right == null)
-        throw new ArgumentException("Cannot calculate similarity because one of the provided solutions or both are null.");
+        throw new ArgumentException("Cannot calculate diversity because one or both of the provided scopes is null.");
+      if (left == right) return 1.0;
 
       double similarity = 0.0;
@@ -50 +51 @@
     }
 
-    protected override double CalculateSimilarity(IScope left, IScope right) {
-      BinaryVector sol1 = left.Variables[Target].Value as BinaryVector;
-      BinaryVector sol2 = right.Variables[Target].Value as BinaryVector;
+    public override double CalculateIndividualSimilarity(IScope left, IScope right) {
+      var sol1 = left.Variables[Target].Value as BinaryVector;
+      var sol2 = right.Variables[Target].Value as BinaryVector;
 
       return CalculateSimilarity(sol1, sol2);