Changeset 15217 for stable/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/SimilarityCalculators

Timestamp:

07/12/17 21:02:01 (8 years ago)

Author:

abeham

Message:

#2666, #2706, #2730, #2736: merged revisions 14412, 14475, 14476, 14659, 14660, 14663, 14779, 14780, 14912, 15050, 15067, 15069, 15079, 15162, 15166, 15172, 15173 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.4 (copied) (copied from trunk/sources/HeuristicLab.Encodings.LinearLinkageEncoding/3.4)
• HeuristicLab.Encodings.LinearLinkageEncoding/3.4/SimilarityCalculators/HammingSimilarityCalculator.cs (modified) (2 diffs)

stable/HeuristicLab.Encodings.LinearLinkageEncoding/3.4/SimilarityCalculators/HammingSimilarityCalculator.cs

@@ -30 +30 @@
   [StorableClass]
   public sealed class HammingSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
-
-    protected override bool IsCommutative {
-      get { return true; }
-    }
+    protected override bool IsCommutative { get { return true; } }
 
     [StorableConstructor]
     private HammingSimilarityCalculator(bool deserializing) : base(deserializing) { }
     private HammingSimilarityCalculator(HammingSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
-    public HammingSimilarityCalculator() { }
+    public HammingSimilarityCalculator() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -45 +42 @@
 
     public static double CalculateSimilarity(LinearLinkage left, LinearLinkage right) {
-      if (left.Length != right.Length) throw new ArgumentException("Comparing encodings of unequal length");
+      if (left == null || right == null)
+        throw new ArgumentException("Cannot calculate similarity because one or both of the provided solutions is null.");
+      if (left.Length != right.Length)
+        throw new ArgumentException("Cannot calculate similarity because the provided solutions have different lengths.");
+      if (left.Length == 0)
+        throw new ArgumentException("Cannot calculate similarity because solutions are of length 0.");
+      if (ReferenceEquals(left, right)) return 1.0;
+
       var similarity = 0;
       for (var i = 0; i < left.Length; i++) {