Changeset 14677 for branches/OptimizationNetworks/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPEvaluator.cs

Timestamp:

02/16/17 15:16:55 (7 years ago)

Author:

abeham

Message:

#2205: added results tab to solution view to analyze vrp solution in more detail

• reorganized insertion infos and adapted some evaluators and instances

File:

• branches/OptimizationNetworks/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPEvaluator.cs (modified) (3 diffs)

branches/OptimizationNetworks/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPEvaluator.cs

@@ -31 +31 @@
   public class SingleDepotVRPEvaluator : VRPEvaluator {
     protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) {
-      TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour)));
+      var tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour)));
       eval.InsertionInfo.AddTourInsertionInfo(tourInfo);
 
@@ -47 +47 @@
 
         //drive there
-        double currentDistace = instance.GetDistance(start, end, solution);
-        distance += currentDistace;
+        double currentDistance = instance.GetDistance(start, end, solution);
+        distance += currentDistance;
 
-        StopInsertionInfo stopInfo = new StopInsertionInfo(start, end);
+        var stopInfo = new StopInsertionInfo(start, end, currentDistance);
         tourInfo.AddStopInsertionInfo(stopInfo);
       }
@@ -68 +68 @@
     protected override double GetTourInsertionCosts(IVRPProblemInstance instance, IVRPEncoding solution, TourInsertionInfo tourInsertionInfo, int index, int customer,
       out bool feasible) {
-      StopInsertionInfo insertionInfo = tourInsertionInfo.GetStopInsertionInfo(index);
+      var insertionInfo = tourInsertionInfo.GetStopInsertionInfo(index);
 
       double costs = 0;