Changeset 4689 for branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/GVR/GVREncoding.cs

Timestamp:

10/29/10 20:28:04 (13 years ago)

Author:

abeham

Message:

#922

• Refactored GVR encoding in HeuristicLab.Problems.VehicleRouting

File:

• branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/GVR/GVREncoding.cs (modified) (1 diff)

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/GVR/GVREncoding.cs

@@ -75 +75 @@
       return tours;
     }
-    
-    public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
-      GVREncoding clone = new GVREncoding(capacity, demand);
-      cloner.RegisterClonedObject(this, clone);
-      clone.Tours = (ItemList<Tour>)cloner.Clone(this.Tours);
-     
-      return clone;
+
+    [StorableConstructor]
+    protected GVREncoding(bool deserializing) : base(deserializing) { }
+    protected GVREncoding(GVREncoding original, Cloner cloner)
+      : base(original, cloner) {
+      this.capacity = original.capacity;
+      this.demand = original.demand;
+      this.Tours = cloner.Clone(original.Tours);
     }
-
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new GVREncoding(this, cloner);
+    }
     public GVREncoding(DoubleValue capacity, DoubleArray demand)
       : base() {
         this.capacity = capacity;
         this.demand = demand;
-    }
-
-    [StorableConstructor]
-    private GVREncoding(bool serializing)
-      : base() {
     }