Changeset 4722 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/TourEncoding.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/General/TourEncoding.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/TourEncoding.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
+using System.Drawing;
 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;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
@@ -35 +34 @@
       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Class; }
     }
-    
+
     #region IVRPEncoding Members
     public virtual List<Tour> GetTours(ILookupParameter<DoubleMatrix> distanceMatrix = null, int maxVehicles = int.MaxValue) {
@@ -51 +50 @@
 
     public int Cities {
-      get 
-      {
+      get {
         int cities = 0;
 
@@ -75 +73 @@
       : base() {
     }
+    protected TourEncoding(TourEncoding original, Cloner cloner)
+      : base(original, cloner) {
+    }
 
     public static void ConvertFrom(IVRPEncoding encoding, TourEncoding solution, ILookupParameter<DoubleMatrix> distanceMatrix) {
@@ -82 +83 @@
     public static void ConvertFrom(List<int> route, TourEncoding solution) {
       solution.Tours = new ItemList<Tour>();
-      
+
       Tour tour = new Tour();
       for (int i = 0; i < route.Count; i++) {