Changeset 12126 for trunk/sources/HeuristicLab.Optimization.Operators

Timestamp:

03/04/15 15:22:21 (9 years ago)

Author:

jkarder

Message:

#2332:

• fixed SolutionSimilarityCalculator.Equals
• problems now wire all of their ISolutionSimilarityCalculators

File:

• trunk/sources/HeuristicLab.Optimization.Operators/3.3/SolutionSimilarityCalculator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Optimization.Operators/3.3/SolutionSimilarityCalculator.cs

@@ -111 +111 @@
       if (x == null || y == null) return false;
 
-      var q1 = x.Variables[QualityVariableName];
-      var q2 = x.Variables[QualityVariableName];
+      var q1 = x.Variables[QualityVariableName].Value;
+      var q2 = y.Variables[QualityVariableName].Value;
 
       return CheckQualityEquality(q1, q2) && CalculateSolutionSimilarity(x, y).IsAlmost(1.0);
@@ -133 +133 @@
         }
       }
-      return 0; // throw exception?
+      return 0;
     }
 
@@ -147 +147 @@
 
       if (da1 != null && da2 != null)
-        return da1.SequenceEqual(da2);
+        return !da1.Zip(da2, Tuple.Create).Any(x => !x.Item1.IsAlmost(x.Item2));
 
       throw new ArgumentException("Could not determine quality equality.");