Changeset 8303 for branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TestFunctions/3.3/SimilarityCalculators

Timestamp:

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

Author:

jkarder

Message:

#1331: made similarity calculators storable and cloneable

File:

• branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TestFunctions/3.3/SimilarityCalculators/SingleObjectiveTestFunctionSimilarityCalculator.cs (modified) (2 diffs)

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) {