Changeset 14677 for branches/OptimizationNetworks/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluation.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/CVRP/CVRPTW/CVRPTWEvaluation.cs (modified) (3 diffs)

branches/OptimizationNetworks/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluation.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Globalization;
+using System.Text;
 
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
-  public class CVRPTWInsertionInfo : CVRPInsertionInfo {
-    private double tourStartTime;
-
-    public double TourStartTime {
-      get { return tourStartTime; }
-    }
+  public class CVRPTWStopInsertionInfo : CVRPStopInsertionInfo {
 
     private double arrivalTime;
@@ -53 +51 @@
     }
 
-    public CVRPTWInsertionInfo(int start, int end, double spareCapacity, double tourStartTime, double arrivalTime, double leaveTime, double spareTime, double waitingTime)
-      : base(start, end, spareCapacity) {
-      this.tourStartTime = tourStartTime;
+    public CVRPTWStopInsertionInfo(int start, int end, double distance, double spareCapacity, double arrivalTime, double leaveTime, double spareTime, double waitingTime)
+      : base(start, end, distance, spareCapacity) {
       this.arrivalTime = arrivalTime;
       this.leaveTime = leaveTime;
       this.spareTime = spareTime;
       this.waitingTime = waitingTime;
+    }
+
+    protected override void GetStopInsertionReport(StringBuilder builder) {
+      base.GetStopInsertionReport(builder);
+      builder.Append("SpareTime:\t");
+      builder.AppendLine(SpareTime.ToString(CultureInfo.CurrentCulture));
+      builder.Append("ArrivalTime:\t");
+      builder.AppendLine(ArrivalTime.ToString(CultureInfo.CurrentCulture));
+      builder.Append("WaitingTime:\t");
+      builder.AppendLine(Math.Max(0, WaitingTime).ToString(CultureInfo.CurrentCulture));
+      builder.Append("LeaveTime:\t");
+      builder.AppendLine(LeaveTime.ToString(CultureInfo.CurrentCulture));
+    }
+  }
+
+  public class CVRPTWTourInsertionInfo : CVRPTourInsertionInfo {
+    private double tourStartTime;
+
+    public double TourStartTime {
+      get { return tourStartTime; }
+    }
+
+    public CVRPTWTourInsertionInfo(int vehicle, double capacity, double tourStartTime)
+      : base(vehicle, capacity) {
+      this.tourStartTime = tourStartTime;
+    }
+
+    protected override void GetTourInsertionReport(StringBuilder builder) {
+      base.GetTourInsertionReport(builder);
+      builder.Append("Tour start:\t");
+      builder.AppendLine(TourStartTime.ToString(CultureInfo.CurrentCulture));
     }
   }
@@ -66 +94 @@
     public double Tardiness { get; set; }
     public double TravelTime { get; set; }
+
+    protected override void GetEvaluationReport(StringBuilder builder) {
+      base.GetEvaluationReport(builder);
+      builder.Append("TravelTime:\t");
+      builder.AppendLine(TravelTime.ToString(CultureInfo.CurrentCulture));
+      builder.Append("Tardiness:\t");
+      builder.AppendLine(Tardiness.ToString(CultureInfo.CurrentCulture));
+    }
   }
 }