Changeset 8319 for branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Operators

Timestamp:

07/24/12 15:04:37 (12 years ago)

Author:

jkarder

Message:

#1331:

• applied some of the changes suggested by ascheibe in comment:32:ticket:1331
• restructured path relinking and improvement operators and similarity calculators
• fixed bug in TSPMultipleGuidesPathRelinker

Location:

branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Operators/3.3

Files:

• HeuristicLab.Optimization.Operators-3.3.csproj (modified) (2 diffs)
• PathRelinker.cs (deleted)
• SingleObjectivePathRelinker.cs (added)
• SingleObjectiveSolutionSimilarityCalculator.cs (added)
• SolutionSimilarityCalculator.cs (moved) (moved from branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Operators/3.3/SimilarityCalculator.cs) (4 diffs)

branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj

@@ -109 +109 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="SingleObjectiveSolutionSimilarityCalculator.cs" />
     <Compile Include="GeneralizedExponentialDiscreteDoubleValueModifier.cs" />
     <Compile Include="MultiObjective\CrowdedComparisonSorter.cs" />
@@ -115 +116 @@
     <Compile Include="MultiObjective\FastNonDominatedSort.cs" />
     <Compile Include="MultiObjective\RankAndCrowdingSorter.cs" />
-    <Compile Include="PathRelinker.cs" />
+    <Compile Include="SingleObjectivePathRelinker.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="ShakingOperator.cs" />
-    <Compile Include="SimilarityCalculator.cs" />
+    <Compile Include="SolutionSimilarityCalculator.cs" />
     <Compile Include="UserDefinedCrossover.cs" />
     <Compile Include="UserDefinedEvaluator.cs" />

branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Operators/3.3/SolutionSimilarityCalculator.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -32 +33 @@
   [Item("SimilarityCalculator", "A base class for items that perform similarity calculation between two solutions.")]
   [StorableClass]
-  public abstract class SimilarityCalculator : Item, ISimilarityCalculator {
-    #region Properties
-    [Storable]
-    private string target;
-    public string Target {
-      get { return target; }
-      set { target = value; }
-    }
-    #endregion
+  public abstract class SolutionSimilarityCalculator : Item, ISolutionSimilarityCalculator, IEqualityComparer<IScope> {
+    [StorableConstructor]
+    protected SolutionSimilarityCalculator(bool deserializing) : base(deserializing) { }
+    protected SolutionSimilarityCalculator(SolutionSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
+    protected SolutionSimilarityCalculator() : base() { }
 
-    [StorableConstructor]
-    protected SimilarityCalculator(bool deserializing) : base(deserializing) { }
-    protected SimilarityCalculator(SimilarityCalculator original, Cloner cloner)
-      : base(original, cloner) {
-      if (original.Target != null)
-        this.target = (string)original.Target.Clone();
-    }
-    protected SimilarityCalculator() : base() { }
-
-    public double[][] CalculateCrowdSimilarity(IScope leftCrowd, IScope rightCrowd) {
-      if (leftCrowd == null || rightCrowd == null)
+    public double[][] CalculateSolutionCrowdSimilarity(IScope leftSolutionCrowd, IScope rightSolutionCrowd) {
+      if (leftSolutionCrowd == null || rightSolutionCrowd == null)
         throw new ArgumentException("Cannot calculate similarity because one of the provided crowds or both are null.");
 
-      var leftIndividuals = leftCrowd.SubScopes;
-      var rightIndividuals = rightCrowd.SubScopes;
+      var leftIndividuals = leftSolutionCrowd.SubScopes;
+      var rightIndividuals = rightSolutionCrowd.SubScopes;
 
       if (!leftIndividuals.Any() || !rightIndividuals.Any())
@@ -65 +53 @@
         similarityMatrix[i] = new double[rightIndividuals.Count];
         for (int j = 0; j < rightIndividuals.Count; j++) {
-          similarityMatrix[i][j] = CalculateIndividualSimilarity(leftIndividuals[i], rightIndividuals[j]);
+          similarityMatrix[i][j] = CalculateSolutionSimilarity(leftIndividuals[i], rightIndividuals[j]);
         }
       }
@@ -72 +60 @@
     }
 
-    public abstract double CalculateIndividualSimilarity(IScope leftIndividual, IScope rightIndividual);
+    public double[][] CalculateSolutionCrowdSimilarity(IScope solutionCrowd) {
+      if (solutionCrowd == null)
+        throw new ArgumentException("Cannot calculate similarity because the provided crowd is null.");
+
+      var individuals = solutionCrowd.SubScopes;
+
+      if (!individuals.Any())
+        throw new ArgumentException("Cannot calculate similarity because the provided crowd is empty.");
+
+      var similarityMatrix = new double[individuals.Count][];
+      for (int i = 0; i < individuals.Count; i++) {
+        similarityMatrix[i] = new double[individuals.Count];
+        for (int j = i; j < individuals.Count; j++) {
+          similarityMatrix[i][j] = similarityMatrix[j][i] = CalculateSolutionSimilarity(individuals[i], individuals[j]);
+        }
+      }
+
+      return similarityMatrix;
+    }
+
+    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 int GetHashCode(IScope obj);
   }
 }