Changeset 6851 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Interfaces

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/Interfaces

Files:

• IVRPEncoding.cs (modified) (1 diff)
• IVRPEvaluator.cs (modified) (1 diff)
• IVRPProblemInstance.cs (modified) (2 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Interfaces/IVRPEncoding.cs

@@ -29 +29 @@
   public interface IVRPEncoding: IItem {
     List<Tour> GetTours();
+    int GetTourIndex(Tour tour);
+    int GetVehicleAssignment(int tour);
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Interfaces/IVRPEvaluator.cs

@@ -35 +35 @@
     VRPEvaluation EvaluateTour(IVRPProblemInstance instance, Tour tour, IVRPEncoding solution);
     bool Feasible(VRPEvaluation evaluation);
-    double GetInsertionCosts(IVRPProblemInstance instance, VRPEvaluation eval, int customer, int tour, int index, out bool feasible);
+    double GetInsertionCosts(IVRPProblemInstance instance, IVRPEncoding solution, VRPEvaluation eval, int customer, int tour, int index, out bool feasible);
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Interfaces/IVRPProblemInstance.cs

@@ -48 +48 @@
     DoubleValue DistanceFactor { get; }
 
-    double GetDistance(int start, int end);
+    double[] GetCoordinates(int city);
+    double GetDemand(int city);
+    double GetDistance(int start, int end, IVRPEncoding solution);
+    double GetInsertionDistance(int start, int customer, int end, IVRPEncoding solution);
     bool Feasible(IVRPEncoding solution);
     bool TourFeasible(Tour tour, IVRPEncoding solution);
@@ -54 +57 @@
     VRPEvaluation EvaluateTour(Tour tour, IVRPEncoding solution);
     bool Feasible(VRPEvaluation eval);
-    double GetInsertionCosts(VRPEvaluation eval, int customer, int tour, int index, out bool feasible);
+    double GetInsertionCosts(VRPEvaluation eval, IVRPEncoding solution, int customer, int tour, int index, out bool feasible);
   }
 }