Changeset 4268 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/GVR/GVREncoding.cs

Timestamp:

08/19/10 16:51:30 (14 years ago)

Author:

svonolfe

Message:

Added prins encoding (#1039)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/GVR/GVREncoding.cs (modified) (5 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/GVR/GVREncoding.cs

@@ -37 +37 @@
 
     [Storable]
-    private IntValue vehicles { get; set; }
-
-    [Storable]
     private DoubleArray demand { get; set; }
 
-    public override List<Tour> GetTours() {
+    public override List<Tour> GetTours(ILookupParameter<DoubleMatrix> distanceMatrix = null, int maxVehicles = int.MaxValue) {
       List<Tour> tours = new List<Tour>();
+      Tour newTour = new Tour();
+      double currentDemand = 0;
 
       int toursProcessed = 0;
       foreach (Tour tour in base.Tours) {
-        Tour newTour = new Tour();
-        double currentDemand = 0;
+        if (maxVehicles > tours.Count) {
+          newTour = new Tour();
+          currentDemand = 0;
+        }
 
         foreach (int city in tour.Cities) {
           currentDemand += demand[city];
 
-          if (vehicles.Value > tours.Count + base.Tours.Count - toursProcessed && 
+          if (maxVehicles > tours.Count && 
             currentDemand > capacity.Value) {
             if(newTour.Cities.Count > 0)
@@ -66 +67 @@
         }
 
-        if (newTour.Cities.Count > 0)
+        if (newTour.Cities.Count > 0 &&
+          maxVehicles > tours.Count)
           tours.Add(newTour);
+
         toursProcessed++;
       }
@@ -75 +78 @@
     
     public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
-      GVREncoding clone = new GVREncoding(capacity, demand, vehicles);
+      GVREncoding clone = new GVREncoding(capacity, demand);
       cloner.RegisterClonedObject(this, clone);
       clone.Tours = (ItemList<Tour>)cloner.Clone(this.Tours);
@@ -82 +85 @@
     }
 
-    public GVREncoding(DoubleValue capacity, DoubleArray demand, IntValue vehicles)
+    public GVREncoding(DoubleValue capacity, DoubleArray demand)
       : base() {
         this.capacity = capacity;
         this.demand = demand;
-        this.vehicles = vehicles;
     }
 
@@ -94 +96 @@
     }
 
-    public static GVREncoding ConvertFrom(IVRPEncoding encoding, DoubleValue capacity, DoubleArray demand, IntValue vehicles) {
-      GVREncoding solution = new GVREncoding(capacity, demand, vehicles);
+    public static GVREncoding ConvertFrom(IVRPEncoding encoding, DoubleValue capacity, DoubleArray demand, 
+      ILookupParameter<DoubleMatrix> distanceMatrix) {
+      GVREncoding solution = new GVREncoding(capacity, demand);
 
-      TourEncoding.ConvertFrom(encoding, solution);
+      TourEncoding.ConvertFrom(encoding, solution, distanceMatrix);
 
       return solution;
     }
 
-    public static GVREncoding ConvertFrom(List<int> route, DoubleValue capacity, DoubleArray demand, IntValue vehicles) {
-      GVREncoding solution = new GVREncoding(capacity, demand, vehicles);
+    public static GVREncoding ConvertFrom(List<int> route, DoubleValue capacity, DoubleArray demand) {
+      GVREncoding solution = new GVREncoding(capacity, demand);
 
       TourEncoding.ConvertFrom(route, solution);