Changeset 8299 for branches

Timestamp:

07/18/12 11:10:08 (12 years ago)

Author:

jkarder

Message:

#1331: made SimilarityCalculator storable

Location:

branches/ScatterSearch (trunk integration)

Files:

• HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (1 diff)
• HeuristicLab.Optimization.Operators/3.3/SimilarityCalculator.cs (modified) (3 diffs)

branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

@@ -320 +320 @@
         Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       }
+      ParameterizeMainLoop();
     }
     private void UpdateAnalyzers() {

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

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Optimization.Operators {
@@ -29 +30 @@
   /// </summary>
   [Item("SimilarityCalculator", "A base class for items that perform similarity calculation between two solutions.")]
+  [StorableClass]
   public abstract class SimilarityCalculator : Item, ISimilarityCalculator {
     #region Properties
-    public string Target { get; set; }
+    [Storable]
+    private string target;
+    public string Target {
+      get { return target; }
+      set { target = value; }
+    }
     #endregion
 
+    [StorableConstructor]
     protected SimilarityCalculator(bool deserializing) : base(deserializing) { }
     protected SimilarityCalculator(SimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
@@ -48 +56 @@
     protected abstract double CalculateSimilarity(IScope left, IScope right);
 
-    public override Common.IDeepCloneable Clone(Common.Cloner cloner) { return null; }
+    public override IDeepCloneable Clone(Cloner cloner) { return null; }
   }
 }