Changeset 8304 for branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Operators/3.3

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.Optimization.Operators/3.3/SimilarityCalculator.cs (modified) (2 diffs)

branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Operators/3.3/SimilarityCalculator.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -50 +51 @@
     protected SimilarityCalculator() : base() { }
 
-    public double ExecuteCalculation(IScope left, IScope right) {
-      if (left == null || right == null)
-        throw new ArgumentException("Cannot calculate diversity because one or both of the provided scopes is null.");
+    public double[][] CalculateCrowdSimilarity(IScope leftCrowd, IScope rightCrowd) {
+      if (leftCrowd == null || rightCrowd == null)
+        throw new ArgumentException("Cannot calculate similarity because one of the provided crowds or both are null.");
 
-      if (left == right) return 1.0;
-      else return CalculateSimilarity(left, right);
+      var leftIndividuals = leftCrowd.SubScopes;
+      var rightIndividuals = rightCrowd.SubScopes;
+
+      if (!leftIndividuals.Any() || !rightIndividuals.Any())
+        throw new ArgumentException("Cannot calculate similarity because one of the provided crowds or both are empty.");
+
+      var similarityMatrix = new double[leftIndividuals.Count][];
+      for (int i = 0; i < leftIndividuals.Count; i++) {
+        similarityMatrix[i] = new double[rightIndividuals.Count];
+        for (int j = 0; j < rightIndividuals.Count; j++) {
+          similarityMatrix[i][j] = CalculateIndividualSimilarity(leftIndividuals[i], rightIndividuals[j]);
+        }
+      }
+
+      return similarityMatrix;
     }
 
-    protected abstract double CalculateSimilarity(IScope left, IScope right);
+    public abstract double CalculateIndividualSimilarity(IScope leftIndividual, IScope rightIndividual);
   }
 }