Changeset 2986 for trunk/sources/HeuristicLab.Problems.TSP/3.3/TSP.cs

Timestamp:

03/10/10 03:37:36 (14 years ago)

Author:

swagner

Message:

Worked on linkage between algorithms and problems (#898)

• finished SGA

File:

• trunk/sources/HeuristicLab.Problems.TSP/3.3/TSP.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.TSP/3.3/TSP.cs

@@ -36 +36 @@
   [Item("TSP", "Represents a symmetric Traveling Salesman Problem.")]
   [Creatable("Problems")]
+  [EmptyStorableClass]
   public sealed class TSP : ParameterizedNamedItem, ISingleObjectiveProblem {
     public override Image ItemImage {
@@ -94 +95 @@
       set { BestKnownQualityParameter.Value = value; }
     }
-    private OperatorSet operators;
+    private List<IPermutationOperator> operators;
     public IEnumerable<IOperator> Operators {
-      get {
-        if (operators == null) InitializeOperators();
-        return operators;
-      }
-    }
-    #endregion
-
-    #region Persistence Properties
-    [Storable]
-    private object RestoreEvents {
-      get { return null; }
-      set { RegisterEvents(); }
+      get { return operators.Cast<IOperator>(); }
     }
     #endregion
@@ -127 +117 @@
       ParameterizeEvaluator();
 
-      RegisterEvents();
-    }
+      Initialize();
+    }
+    [StorableConstructor]
+    private TSP(bool deserializing) : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       TSP clone = (TSP)base.Clone(cloner);
-      clone.RegisterEvents();
+      clone.Initialize();
       return clone;
     }
@@ -187 +179 @@
 
     #region Helpers
-    private void RegisterEvents() {
+    [StorableHook(HookType.AfterDeserialization)]
+    private void Initialize() {
+      InitializeOperators();
       CoordinatesParameter.ValueChanged += new EventHandler(CoordinatesParameter_ValueChanged);
       Coordinates.ItemChanged += new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
@@ -205 +199 @@
     }
     private void InitializeOperators() {
-      operators = new OperatorSet();
+      operators = new List<IPermutationOperator>();
       if (ApplicationManager.Manager != null) {
-        foreach (IPermutationOperator op in ApplicationManager.Manager.GetInstances<IPermutationOperator>())
-          operators.Add(op);
+        operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>());
         ParameterizeOperators();
       }