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

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

Location:

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

Files:

• SingleObjectiveSolutionSimilarityCalculator.cs (modified) (2 diffs)
• SolutionSimilarityCalculator.cs (modified) (2 diffs)

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

@@ -34 +34 @@
     #region Properties
     [Storable]
+    public string SolutionVariableName { get; set; }
+    [Storable]
     public string QualityVariableName { get; set; }
-    [Storable]
-    public string SolutionVariableName { get; set; }
     #endregion
 
@@ -43 +43 @@
     protected SingleObjectiveSolutionSimilarityCalculator(SingleObjectiveSolutionSimilarityCalculator original, Cloner cloner)
       : base(original, cloner) {
-      if (original.QualityVariableName != null)
-        this.QualityVariableName = (string)original.QualityVariableName.Clone();
+      this.SolutionVariableName = original.SolutionVariableName;
+      this.QualityVariableName = original.QualityVariableName;
     }
     protected SingleObjectiveSolutionSimilarityCalculator() : base() { }
 
     public override int GetHashCode(IScope scope) {
-      var quality = ((DoubleValue)scope.Variables[QualityVariableName].Value).Value;
-      return quality.ToString().GetHashCode();
+      return ((DoubleValue)scope.Variables[QualityVariableName].Value).Value.GetHashCode();
     }
   }

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;
@@ -33 +32 @@
   [Item("SimilarityCalculator", "A base class for items that perform similarity calculation between two solutions.")]
   [StorableClass]
-  public abstract class SolutionSimilarityCalculator : Item, ISolutionSimilarityCalculator, IEqualityComparer<IScope> {
+  public abstract class SolutionSimilarityCalculator : Item, ISolutionSimilarityCalculator {
     [StorableConstructor]
     protected SolutionSimilarityCalculator(bool deserializing) : base(deserializing) { }