Changeset 8303 for branches/ScatterSearch (trunk integration)

Timestamp:

07/19/12 11:04:48 (12 years ago)

Author:

jkarder

Message:

#1331: made similarity calculators storable and cloneable

Location:

branches/ScatterSearch (trunk integration)

Files:

• HeuristicLab.Optimization.Operators/3.3/SimilarityCalculator.cs (modified) (2 diffs)
• HeuristicLab.Problems.Knapsack/3.3/SimilarityCalculators/KnapsackSimilarityCalculator.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/SimilarityCalculators/SingleObjectiveTestFunctionSimilarityCalculator.cs (modified) (2 diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/SimilarityCalculators/TSPSimilarityCalculator.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.3/SimilarityCalculators/VRPSimilarityCalculator.cs (modified) (1 diff)

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

@@ -43 +43 @@
     [StorableConstructor]
     protected SimilarityCalculator(bool deserializing) : base(deserializing) { }
-    protected SimilarityCalculator(SimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
+    protected SimilarityCalculator(SimilarityCalculator original, Cloner cloner)
+      : base(original, cloner) {
+      if (original.Target != null)
+        this.target = (string)original.Target.Clone();
+    }
     protected SimilarityCalculator() : base() { }
 
@@ -55 +59 @@
 
     protected abstract double CalculateSimilarity(IScope left, IScope right);
-
-    public override IDeepCloneable Clone(Cloner cloner) { return null; }
   }
 }

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.Knapsack/3.3/SimilarityCalculators/KnapsackSimilarityCalculator.cs

@@ -36 +36 @@
     public KnapsackSimilarityCalculator() : base() { }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new KnapsackSimilarityCalculator(this, cloner);
+    }
+
     public static double CalculateSimilarity(BinaryVector left, BinaryVector right) {
       if (left == null || right == null)

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TestFunctions/3.3/SimilarityCalculators/SingleObjectiveTestFunctionSimilarityCalculator.cs

@@ -26 +26 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization.Operators;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.TestFunctions {
@@ -32 +33 @@
   /// </summary>
   [Item("SingleObjectiveTestFunctionSimilarityCalculator", "An operator that performs similarity calculation between two test functions solutions.")]
+  [StorableClass]
   public sealed class SingleObjectiveTestFunctionSimilarityCalculator : SimilarityCalculator {
     #region Properties
+    [Storable]
     public DoubleMatrix Bounds { get; set; }
     #endregion
 
+    [StorableConstructor]
     private SingleObjectiveTestFunctionSimilarityCalculator(bool deserializing) : base(deserializing) { }
-    private SingleObjectiveTestFunctionSimilarityCalculator(SingleObjectiveTestFunctionSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
+    private SingleObjectiveTestFunctionSimilarityCalculator(SingleObjectiveTestFunctionSimilarityCalculator original, Cloner cloner)
+      : base(original, cloner) {
+      this.Bounds = cloner.Clone(original.Bounds);
+    }
     public SingleObjectiveTestFunctionSimilarityCalculator() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SingleObjectiveTestFunctionSimilarityCalculator(this, cloner);
+    }
 
     public static double CalculateSimilarity(RealVector left, RealVector right, DoubleMatrix bounds) {

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TravelingSalesman/3.3/SimilarityCalculators/TSPSimilarityCalculator.cs

@@ -36 +36 @@
     public TSPSimilarityCalculator() : base() { }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new TSPSimilarityCalculator(this, cloner);
+    }
+
     public static double CalculateSimilarity(Permutation left, Permutation right) {
       if (left == null || right == null)

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting/3.3/SimilarityCalculators/VRPSimilarityCalculator.cs

@@ -38 +38 @@
     private VRPSimilarityCalculator(VRPSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
     public VRPSimilarityCalculator() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new VRPSimilarityCalculator(this, cloner);
+    }
 
     public static double CalculateSimilarity(PotvinEncoding left, PotvinEncoding right) {