Changeset 8322 for branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch

Timestamp:

07/25/12 10:14:58 (12 years ago)

Author:

jkarder

Message:

#1331:

• applied some of the changes suggested by ascheibe in comment:32:ticket:1331
• minor code improvements

File:

• branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch/3.3/SolutionPoolUpdateMethod.cs (modified) (3 diffs)

branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch/3.3/SolutionPoolUpdateMethod.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -129 +128 @@
       if (orderedOffspring.Any(hasBetterQuality)) {
         // produce the set union
-        var union = orderedParents.Union(orderedOffspring.Where(hasBetterQuality), new SolutionEqualityComparer<IScope>(SimilarityCalculator.CalculateSolutionSimilarity));
+        var union = orderedParents.Union(orderedOffspring.Where(hasBetterQuality), SimilarityCalculator);
         if (union.Count() > orderedParents.Count()) {
           var orderedUnion = Maximization.Value ? union.OrderByDescending(x => x.Variables[QualityParameter.ActualName].Value) :
@@ -140 +139 @@
       return base.Apply();
     }
-
-    // derive SingleObjectiveSolutionSimilarityCalculator from EqualityComparer
-    // delete this ...
-    public class SolutionEqualityComparer<T> : EqualityComparer<T> {
-      private readonly Func<T, T, double> similarityCalculator;
-
-      public SolutionEqualityComparer(Func<T, T, double> similarityCalculator) {
-        this.similarityCalculator = similarityCalculator;
-      }
-
-      public override bool Equals(T x, T y) {
-        if (object.ReferenceEquals(x, y)) return true;
-        if (x == null || y == null) return false;
-        return similarityCalculator(x, y) == 1.0;
-      }
-
-      public override int GetHashCode(T obj) {
-        return 0; // return the same hash code for each object, otherwise Equals will not be called
-      }
-    }
   }
 }