Changeset 6851 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General

Timestamp:

09/29/11 15:51:56 (13 years ago)

Author:

svonolfe

Message:

Added support for multi depot CVRP instances (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General

Files:

• Crossovers/BiasedMultiVRPSolutionCrossover.cs (modified) (1 diff)
• Manipulators/BiasedMultiVRPSolutionManipulator.cs (modified) (1 diff)
• PermutationEncoding.cs (modified) (1 diff)
• TourEncoding.cs (modified) (2 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Crossovers/BiasedMultiVRPSolutionCrossover.cs

@@ -160 +160 @@
       OperationCollection next = new OperationCollection(successorOp);
       if (successor != null) {
-        SelectedOperatorParameter.ActualValue = new StringValue(successor.GetType().Name);
+        SelectedOperatorParameter.ActualValue = new StringValue(successor.Name);
 
         if (CreateChildOperation)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Manipulators/BiasedMultiVRPSolutionManipulator.cs

@@ -160 +160 @@
       OperationCollection next = new OperationCollection(successorOp);
       if (successor != null) {
-        SelectedOperatorParameter.ActualValue = new StringValue(successor.GetType().Name);
+        SelectedOperatorParameter.ActualValue = new StringValue(successor.Name);
 
         if (CreateChildOperation)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/PermutationEncoding.cs

@@ -35 +35 @@
     #region IVRPEncoding Members
     public abstract List<Tour> GetTours();
+
+    public int GetTourIndex(Tour tour) {
+      int index = -1;
+
+      List<Tour> tours = GetTours();
+      for (int i = 0; i < tours.Count; i++) {
+        if (tours[i].IsEqual(tour)) {
+          index = i;
+          break;
+        }
+      }
+
+      return index;
+    }
+
+    public virtual int GetVehicleAssignment(int tour) {
+      return tour;
+    }
     #endregion
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/TourEncoding.cs

@@ -38 +38 @@
     
     #region IVRPEncoding Members
-    public void Repair() {
+    public virtual void Repair() {
       List<Tour> toBeRemoved = new List<Tour>();
       foreach (Tour tour in Tours) {
@@ -62 +62 @@
 
      return result;
+    }
+
+    public int GetTourIndex(Tour tour) {
+      int index = -1;
+
+      for (int i = 0; i < Tours.Count; i++) {
+        if (Tours[i].IsEqual(tour)) {
+          index = i;
+          break;
+        }
+      }
+
+      return index;
+    }
+
+    public virtual int GetVehicleAssignment(int tour) {
+      return tour;
     }