Context Navigation

Changeset 4692 for branches

Timestamp:

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

Author:

gkronber

Message:

Refactored cloning in HeuristicLab.Problems.VehicleRouting. #922

Location:

Files:

-                      r4174
+                      r4692
     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>();
 …
     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);
+    }
 …
       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;
 …
         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);
+        }
+      }

-                      r4352
+                      r4692
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings {
 …
     [StorableConstructor]
     protected VRPCreator(bool deserializing) : base(deserializing) { }
+    protected VRPCreator(VRPCreator original, Cloner cloner)
+      : base(original, cloner) {
+    }
     public VRPCreator()
       : base() {
       Parameters.Add(new LookupParameter<IVRPEncoding>("VRPTours", "The new VRP tours."));
+    }
     #endregion
+  }

-                      r4179
+                      r4692
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings {
 …
     [StorableConstructor]
     protected VRPCrossover(bool deserializing) : base(deserializing) { }
+    protected VRPCrossover(VRPCrossover original, Cloner cloner)
+      : base(original, cloner) {
+    }
     public VRPCrossover()
       : base() {

-                      r4183
+                      r4692
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings {
 …
     [StorableConstructor]
     protected VRPManipulator(bool deserializing) : base(deserializing) { }
+    protected VRPManipulator(VRPManipulator original, Cloner cloner)
+      : base(original, cloner) {
+    }
     public VRPManipulator()
       : base() {

-                      r4179
+                      r4692
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 namespace HeuristicLab.Problems.VehicleRouting.Encodings {
 …
       get { return (ILookupParameter<IVRPEncoding>)Parameters["VRPTours"]; }
+    }
     #endregion
     [StorableConstructor]
     protected VRPMoveOperator(bool deserializing) : base(deserializing) { }
+    protected VRPMoveOperator(VRPMoveOperator original, Cloner cloner) : base(original, cloner) { }
     public VRPMoveOperator()
       : base() {

Note: See TracChangeset for help on using the changeset viewer.