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

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

@@ -20 +20 @@
 #endregion
 
+using System.Globalization;
+using System.Linq;
+using System.Text;
 
 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
-  public class CVRPInsertionInfo : StopInsertionInfo {
+  public class CVRPStopInsertionInfo : StopInsertionInfo {
     private double spareCapacity;
 
@@ -29 +32 @@
     }
 
-    public CVRPInsertionInfo(int start, int end, double spareCapacity)
-      : base(start, end) {
+    public CVRPStopInsertionInfo(int start, int end, double distance, double spareCapacity)
+      : base(start, end, distance) {
       this.spareCapacity = spareCapacity;
+    }
+
+    protected override void GetStopInsertionReport(StringBuilder builder) {
+      base.GetStopInsertionReport(builder);
+      builder.Append("Capacity left:\t");
+      builder.AppendLine(SpareCapacity.ToString(CultureInfo.CurrentCulture));
+    }
+  }
+
+  public class CVRPTourInsertionInfo : TourInsertionInfo {
+    private double capacity;
+
+    public virtual double SpareCapacity {
+      get { return stopInsertionInfos.Count == 0 ? capacity : ((CVRPStopInsertionInfo)stopInsertionInfos.Last()).SpareCapacity; }
+    }
+    
+    public CVRPTourInsertionInfo(int vehicle, double capacity)
+      : base(vehicle) {
+      this.capacity = capacity;
+    }
+
+    protected override void GetTourInsertionReport(StringBuilder builder) {
+      base.GetTourInsertionReport(builder);
+      builder.Append("Capacity left:\t");
+      builder.AppendLine(SpareCapacity.ToString(CultureInfo.CurrentCulture));
     }
   }
@@ -37 +65 @@
   public class CVRPEvaluation : VRPEvaluation {
     public double Overload { get; set; }
+
+    protected override void GetEvaluationReport(StringBuilder builder) {
+      base.GetEvaluationReport(builder);
+      builder.Append("Overload:\t");
+      builder.AppendLine(Overload.ToString(CultureInfo.CurrentCulture));
+    }
   }
 }