Changeset 3317 for trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/PathTSPTour.cs

Timestamp:

04/13/10 06:41:56 (14 years ago)

Author:

swagner

Message:

Implemented ReadOnlyView property for items (#969).

File:

• trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/PathTSPTour.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/PathTSPTour.cs

@@ -39 +39 @@
     }
 
+    [Storable]
     private DoubleMatrix coordinates;
-    [Storable]
     public DoubleMatrix Coordinates {
       get { return coordinates; }
@@ -52 +52 @@
       }
     }
+    [Storable]
     private Permutation permutation;
-    [Storable]
     public Permutation Permutation {
       get { return permutation; }
@@ -69 +69 @@
     public PathTSPTour(DoubleMatrix coordinates)
       : base() {
-      Coordinates = coordinates;
+      this.coordinates = coordinates;
+      Initialize();
     }
     public PathTSPTour(DoubleMatrix coordinates, Permutation permutation)
-      : this(coordinates) {
-      Permutation = permutation;
+      : base() {
+      this.coordinates = coordinates;
+      this.permutation = permutation;
+      Initialize();
+    }
+    [StorableConstructor]
+    private PathTSPTour(bool deserializing) : base(deserializing) { }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void Initialize() {
+      if (coordinates != null) RegisterCoordinatesEvents();
+      if (permutation != null) RegisterPermutationEvents();
     }
 
@@ -79 +90 @@
       PathTSPTour clone = new PathTSPTour();
       cloner.RegisterClonedObject(this, clone);
-      clone.Coordinates = (DoubleMatrix)cloner.Clone(coordinates);
-      clone.Permutation = (Permutation)cloner.Clone(permutation);
+      clone.ReadOnlyView = ReadOnlyView;
+      clone.coordinates = (DoubleMatrix)cloner.Clone(coordinates);
+      clone.permutation = (Permutation)cloner.Clone(permutation);
+      clone.Initialize();
       return clone;
     }