Changeset 4722 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/GVR/GVREncoding.cs

Timestamp:

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

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.3/Encodings/GVR/GVREncoding.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/GVR/GVREncoding.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Drawing;
-using System.Collections.Generic;
 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
 
@@ -75 +73 @@
       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() {
     }