Changeset 9030 for trunk/sources

Timestamp:

12/12/12 09:19:39 (12 years ago)

Author:

ascheibe

Message:

#1331 improved TSPSimilarityCalculator and SingleObjectiveSolutionSimilarityCalculator

Location:

trunk/sources

Files:

• HeuristicLab.Optimization.Operators/3.3/SingleObjectiveSolutionSimilarityCalculator.cs (modified) (1 diff)
• HeuristicLab.Problems.TravelingSalesman/3.3/SimilarityCalculators/TSPSimilarityCalculator.cs (modified) (1 diff)

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

@@ -53 +53 @@
       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);
+      return q1.IsAlmost(q2) || CalculateSolutionSimilarity(x, y).IsAlmost(1.0);
     }
 

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/SimilarityCalculators/TSPSimilarityCalculator.cs

@@ -50 +50 @@
       if (left.Length != right.Length)
         throw new ArgumentException("Cannot calculate similarity because the provided solutions have different lengths.");
-      var comparer = new PermutationEqualityComparer();
-      if (object.ReferenceEquals(left, right) || comparer.Equals(left, right)) return 1.0;
+      if (object.ReferenceEquals(left, right)) return 1.0;
 
       switch (left.PermutationType) {