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

Timestamp:

07/19/12 13:19:12 (12 years ago)

Author:

jkarder

Message:

#1331: added support for similarity calculation between multiple individuals

Location:

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

Files:

• ReferenceSetUpdateMethod.cs (modified) (1 diff)
• SolutionPoolUpdateMethod.cs (modified) (1 diff)

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

@@ -80 +80 @@
         double similarity = 0;
         foreach (var rScope in CurrentScope.SubScopes[1].SubScopes) {
-          similarity += SimilarityCalculator.ExecuteCalculation(pScope, rScope);
+          similarity += SimilarityCalculator.CalculateIndividualSimilarity(pScope, rScope);
         }
         population[pScope] = similarity;

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

@@ -130 +130 @@
       if (orderedOffspring.Any(hasBetterQuality)) {
         // produce the set union
-        var union = orderedParents.Union(orderedOffspring.Where(hasBetterQuality), new SolutionEqualityComparer<IScope>(SimilarityCalculator.ExecuteCalculation));
+        var union = orderedParents.Union(orderedOffspring.Where(hasBetterQuality), new SolutionEqualityComparer<IScope>(SimilarityCalculator.CalculateIndividualSimilarity));
         if (union.Count() > orderedParents.Count()) {
           var orderedUnion = Maximization.Value ? union.OrderByDescending(x => x.Variables[QualityParameter.ActualName].Value) :