Changeset 8345 for trunk/sources

Timestamp:

07/27/12 15:16:18 (12 years ago)

Author:

jkarder

Message:

#1331: made similarity based operators storable and cloneable

Location:

trunk/sources/HeuristicLab.Algorithms.ScatterSearch/3.3

Files:

• ReferenceSetUpdateMethod.cs (modified) (3 diffs)
• SolutionPoolUpdateMethod.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.ScatterSearch/3.3/ReferenceSetUpdateMethod.cs

@@ -27 +27 @@
 using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
-using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -39 +38 @@
   public sealed class ReferenceSetUpdateMethod : SingleSuccessorOperator, ISimilarityBasedOperator {
     #region ISimilarityBasedOperator Members
+    [Storable]
     public ISolutionSimilarityCalculator SimilarityCalculator { get; set; }
     #endregion
@@ -62 +62 @@
     [StorableConstructor]
     private ReferenceSetUpdateMethod(bool deserializing) : base(deserializing) { }
-    private ReferenceSetUpdateMethod(ReferenceSetUpdateMethod original, Cloner cloner) : base(original, cloner) { }
+    private ReferenceSetUpdateMethod(ReferenceSetUpdateMethod original, Cloner cloner)
+      : base(original, cloner) {
+      this.SimilarityCalculator = cloner.Clone(original.SimilarityCalculator);
+    }
     public ReferenceSetUpdateMethod()
       : base() {

trunk/sources/HeuristicLab.Algorithms.ScatterSearch/3.3/SolutionPoolUpdateMethod.cs

@@ -38 +38 @@
   public sealed class SolutionPoolUpdateMethod : SingleSuccessorOperator, ISimilarityBasedOperator {
     #region ISimilarityBasedOperator Members
+    [Storable]
     public ISolutionSimilarityCalculator SimilarityCalculator { get; set; }
     #endregion
@@ -81 +82 @@
     [StorableConstructor]
     private SolutionPoolUpdateMethod(bool deserializing) : base(deserializing) { }
-    private SolutionPoolUpdateMethod(SolutionPoolUpdateMethod original, Cloner cloner) : base(original, cloner) { }
+    private SolutionPoolUpdateMethod(SolutionPoolUpdateMethod original, Cloner cloner)
+      : base(original, cloner) {
+      this.SimilarityCalculator = cloner.Clone(original.SimilarityCalculator);
+    }
     public SolutionPoolUpdateMethod() : base() { Initialize(); }