Changeset 4722 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Zhu/ZhuEncoding.cs

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.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Zhu/ZhuEncoding.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Zhu/ZhuEncoding.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -25 +27 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Collections.Generic;
 using HeuristicLab.Problems.VehicleRouting.Encodings.General;
-using System;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Zhu {
@@ -44 +44 @@
     [Storable]
     DoubleArray dueTimeArray;
-    
+
     [Storable]
     DoubleArray serviceTimeArray;
@@ -50 +50 @@
     [Storable]
     DoubleArray readyTimeArray;
-    
+
     [Storable]
     DoubleArray demandArray;
@@ -75 +75 @@
           distanceMatrix,
           useDistanceMatrix)) {
-            newTour.Cities.Remove(city);
-            if (newTour.Cities.Count > 0)
-              result.Add(newTour);
+          newTour.Cities.Remove(city);
+          if (newTour.Cities.Count > 0)
+            result.Add(newTour);
 
-            newTour = new Tour();
-            newTour.Cities.Add(city);
+          newTour = new Tour();
+          newTour.Cities.Add(city);
         }
       }
@@ -124 +124 @@
     #endregion
 
-    public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
-      ZhuEncoding clone = new ZhuEncoding(
-        new Permutation(this.PermutationType, this.array), cities, 
-        dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
-        coordinates, useDistanceMatrix);
-
-      cloner.RegisterClonedObject(this, clone);
-      clone.readOnly = readOnly;
-      return clone;
+    [StorableConstructor]
+    protected ZhuEncoding(bool deserializing) : base(deserializing) { }
+    protected ZhuEncoding(ZhuEncoding original, Cloner cloner)
+      : base(original, cloner) {
+      this.cities = original.cities;
+      this.dueTimeArray = original.dueTimeArray;
+      this.serviceTimeArray = original.serviceTimeArray;
+      this.readyTimeArray = original.readyTimeArray;
+      this.demandArray = original.demandArray;
+      this.capacity = original.capacity;
+      this.coordinates = original.coordinates;
+      this.useDistanceMatrix = original.useDistanceMatrix;
+    }
+    public ZhuEncoding(Permutation permutation, int cities,
+     DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,
+     DoubleMatrix coordinates, BoolValue useDistanceMatrix)
+      : base(permutation) {
+      this.cities = cities;
+      this.dueTimeArray = dueTimeArray;
+      this.serviceTimeArray = serviceTimeArray;
+      this.readyTimeArray = readyTimeArray;
+      this.demandArray = demandArray;
+      this.capacity = capacity;
+      this.coordinates = coordinates;
+      this.useDistanceMatrix = useDistanceMatrix;
     }
 
-    public ZhuEncoding(Permutation permutation, int cities,
-      DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,
-      DoubleMatrix coordinates, BoolValue useDistanceMatrix)
-      : base(permutation) {
-        this.cities = cities;
-        this.dueTimeArray = dueTimeArray;
-        this.serviceTimeArray = serviceTimeArray;
-        this.readyTimeArray = readyTimeArray;
-        this.demandArray = demandArray;
-        this.capacity = capacity;
-        this.coordinates = coordinates;
-        this.useDistanceMatrix = useDistanceMatrix;
-    }
-
-    [StorableConstructor]
-    private ZhuEncoding(bool serializing)
-      : base(serializing) {
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ZhuEncoding(this, cloner);
     }
 
@@ -171 +172 @@
     }
 
-    public static ZhuEncoding ConvertFrom(List<int> routeParam, int cities, 
+    public static ZhuEncoding ConvertFrom(List<int> routeParam, int cities,
       DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,
       DoubleMatrix coordinates, BoolValue useDistanceMatrix) {
@@ -183 +184 @@
 
       return new ZhuEncoding(
-        new Permutation(PermutationTypes.RelativeUndirected, route.ToArray()), cities, 
+        new Permutation(PermutationTypes.RelativeUndirected, route.ToArray()), cities,
         dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
         coordinates, useDistanceMatrix);