Changeset 6851 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPEvaluator.cs

Timestamp:

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

Author:

svonolfe

Message:

Added support for multi depot CVRP instances (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPEvaluator.cs (modified) (4 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPEvaluator.cs

@@ -38 +38 @@
   [Item("CVRPEvaluator", "Represents a single depot CVRP evaluator.")]
   [StorableClass]
-  public class CVRPEvaluator: SingleDepotVRPEvaluator {
+  public class CVRPEvaluator: VRPEvaluator {
     public ILookupParameter<DoubleValue> OverloadParameter {
       get { return (ILookupParameter<DoubleValue>)Parameters["Overload"]; }
@@ -79 +79 @@
 
         //drive there
-        double currentDistace = instance.GetDistance(start, end);
+        double currentDistace = instance.GetDistance(start, end, solution);
         distance += currentDistace;
 
@@ -103 +103 @@
     }
 
-    protected override double GetTourInsertionCosts(IVRPProblemInstance instance, TourInsertionInfo tourInsertionInfo, int index, int customer, 
+    protected override double GetTourInsertionCosts(IVRPProblemInstance instance, IVRPEncoding solution, TourInsertionInfo tourInsertionInfo, int index, int customer, 
       out bool feasible) {
       CVRPInsertionInfo insertionInfo = tourInsertionInfo.GetStopInsertionInfo(index) as CVRPInsertionInfo;
@@ -113 +113 @@
       double overloadPenalty = cvrp.OverloadPenalty.Value;
 
-      double distance = instance.GetDistance(insertionInfo.Start, insertionInfo.End);
+      double distance = instance.GetDistance(insertionInfo.Start, insertionInfo.End, solution);
       double newDistance =
-        instance.GetDistance(insertionInfo.Start, customer) +
-        instance.GetDistance(customer, insertionInfo.End);
+        instance.GetDistance(insertionInfo.Start, customer, solution) +
+        instance.GetDistance(customer, insertionInfo.End, solution);
       costs += instance.DistanceFactor.Value * (newDistance - distance);