Changeset 8988

Timestamp:

12/03/12 13:32:42 (12 years ago)

Author:

jkarder

Message:

#1331: Equals method in SingleObjectiveSolutionSimilarityCalculator now only performs structural comparison if solutions have almost the same quality

Location:

trunk/sources/HeuristicLab.Optimization.Operators/3.3

Files:

• SingleObjectiveSolutionSimilarityCalculator.cs (modified) (1 diff)
• SolutionSimilarityCalculator.cs (modified) (1 diff)

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

@@ -48 +48 @@
     protected SingleObjectiveSolutionSimilarityCalculator() : base() { }
 
+    public override bool Equals(IScope x, IScope y) {
+      if (object.ReferenceEquals(x, y)) return true;
+      if (x == null || y == null) return false;
+      double q1 = ((DoubleValue)x.Variables[QualityVariableName].Value).Value;
+      double q2 = ((DoubleValue)y.Variables[QualityVariableName].Value).Value;
+      return q1.IsAlmost(q2) && CalculateSolutionSimilarity(x, y).IsAlmost(1.0);
+    }
+
     public override int GetHashCode(IScope scope) {
       return ((DoubleValue)scope.Variables[QualityVariableName].Value).Value.GetHashCode();

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

@@ -80 +80 @@
     }
 
-    public bool Equals(IScope x, IScope y) {
-      if (object.ReferenceEquals(x, y)) return true;
-      if (x == null || y == null) return false;
-      return CalculateSolutionSimilarity(x, y) == 1.0;
-    }
-
     public abstract double CalculateSolutionSimilarity(IScope leftSolution, IScope rightSolution);
+    public abstract bool Equals(IScope x, IScope y);
     public abstract int GetHashCode(IScope obj);
   }