Changeset 4692 for branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Tour.cs

Timestamp:

10/29/10 20:36:25 (14 years ago)

Author:

gkronber

Message:

Refactored cloning in HeuristicLab.Problems.VehicleRouting. #922

File:

• branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Tour.cs (modified) (4 diffs)

branches/CloningRefactoring/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Tour.cs

@@ -32 +32 @@
     public List<int> Cities { get; private set; }
 
+    [StorableConstructor]
+    protected Tour(bool deserializing) : base(deserializing) { }
+    protected Tour(Tour original, Cloner cloner)
+      : base(original, cloner) {
+      Cities = new List<int>(original.Cities);
+    }
     public Tour() {
       Cities = new List<int>();
@@ -37 +43 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      Tour clone = base.Clone(cloner) as Tour;
-      clone.Cities = new List<int>(Cities);
-
-      return clone;
+      return new Tour(this, cloner);
     }
 
@@ -63 +66 @@
       return eval.Overload < double.Epsilon && eval.Tardiness < double.Epsilon;
     }
-    
-    public double GetLength(DoubleMatrix coordinates, 
-      ILookupParameter<DoubleMatrix> distanceMatrix, 
+
+    public double GetLength(DoubleMatrix coordinates,
+      ILookupParameter<DoubleMatrix> distanceMatrix,
       BoolValue useDistanceMatrix) {
       double length = 0;
@@ -79 +82 @@
         for (int i = 1; i < cities.Count; i++) {
           length += VRPUtilities.GetDistance(
-            cities[i - 1], cities[i], coordinates, distanceMatrix, useDistanceMatrix); 
+            cities[i - 1], cities[i], coordinates, distanceMatrix, useDistanceMatrix);
         }
       }