Changeset 4722 for trunk/sources/HeuristicLab.Algorithms.TabuSearch

Timestamp:

11/06/10 01:56:04 (14 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.TabuSearch/3.3/TabuListCreator.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.TabuSearch/3.3/TabuNeighborhoodAnalyzer.cs (modified) (3 diffs)
• HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.TabuSearch/3.3/TabuSelector.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuListCreator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Operators;
@@ -39 +40 @@
     }
 
+    [StorableConstructor]
+    protected TabuListCreator(bool deserializing) : base(deserializing) { }
+    protected TabuListCreator(TabuListCreator original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new TabuListCreator(this, cloner);
+    }
+
     public TabuListCreator()
       : base() {

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuNeighborhoodAnalyzer.cs

@@ -21 +21 @@
 
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -26 +27 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Algorithms.TabuSearch {
+  [StorableClass]
+  [Item("TabuNeighborhoodAnalyzer", "Analyzes the tabu neighborhood")]
   public class TabuNeighborhoodAnalyzer : SingleSuccessorOperator, IAnalyzer {
     public ScopeTreeLookupParameter<BoolValue> IsTabuParameter {
@@ -39 +43 @@
     }
 
+    [StorableConstructor]
+    protected TabuNeighborhoodAnalyzer(bool deserializing) : base(deserializing) { }
+    protected TabuNeighborhoodAnalyzer(TabuNeighborhoodAnalyzer original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new TabuNeighborhoodAnalyzer(this, cloner);
+    }
     public TabuNeighborhoodAnalyzer()
       : base() {

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs

@@ -190 +190 @@
     [StorableConstructor]
     private TabuSearch(bool deserializing) : base(deserializing) { }
-
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
+    private TabuSearch(TabuSearch original, Cloner cloner)
+      : base(original, cloner) {
+      moveQualityAnalyzer = cloner.Clone(original.moveQualityAnalyzer);
+      tabuNeighborhoodAnalyzer = cloner.Clone(original.tabuNeighborhoodAnalyzer);
+      Initialize();
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
-      TabuSearch clone = (TabuSearch)base.Clone(cloner);
-      clone.moveQualityAnalyzer = (BestAverageWorstQualityAnalyzer)cloner.Clone(moveQualityAnalyzer);
-      clone.tabuNeighborhoodAnalyzer = (TabuNeighborhoodAnalyzer)cloner.Clone(tabuNeighborhoodAnalyzer);
-      clone.Initialize();
-      return clone;
+      return new TabuSearch(this, cloner);
     }
 
@@ -313 +318 @@
 
     #region Helpers
-    [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
       if (Problem != null) {

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs

@@ -21 +21 @@
 
 using HeuristicLab.Analysis;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -85 +86 @@
 
     [StorableConstructor]
-    private TabuSearchMainLoop(bool deserializing) : base() { }
+    private TabuSearchMainLoop(bool deserializing) : base(deserializing) { }
     public TabuSearchMainLoop()
       : base() {
       Initialize();
+    }
+    private TabuSearchMainLoop(TabuSearchMainLoop original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new TabuSearchMainLoop(this, cloner);
     }
 

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSelector.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -78 +79 @@
       get { return CopySelectedParameter.Value; }
       set { CopySelectedParameter.Value = value; }
+    }
+
+    [StorableConstructor]
+    protected TabuSelector(bool deserializing) : base(deserializing) { }
+    protected TabuSelector(TabuSelector original, Cloner cloner)
+      : base(original, cloner) {
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new TabuSelector(this, cloner);
     }