From 5e1159100957f520d78d97264e90ef0f9d95d300 Mon Sep 17 00:00:00 2001
From: oblonski <4sschroeder@gmail.com>
Date: Mon, 2 Jun 2014 12:12:55 +0200
Subject: [PATCH] added asterix to identify penalty-vehicles

---
 .../jsprit/analysis/toolbox/SolutionPrinter.java  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/SolutionPrinter.java b/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/SolutionPrinter.java
index 4ad0ff69..fa92732e 100644
--- a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/SolutionPrinter.java
+++ b/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/SolutionPrinter.java
@@ -24,6 +24,7 @@ import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
 import jsprit.core.problem.solution.route.VehicleRoute;
 import jsprit.core.problem.solution.route.activity.TourActivity;
 import jsprit.core.problem.solution.route.activity.TourActivity.JobActivity;
+import jsprit.core.problem.vehicle.PenaltyVehicleType;
 
 /**
  * Printer to print the details of a vehicle-routing-problem solution.
@@ -109,7 +110,7 @@ public class SolutionPrinter {
 		for(VehicleRoute route : solution.getRoutes()){
 			System.out.format("+---------+----------------------+-----------------------+-----------------+-----------------+-----------------+-----------------+%n");
 			double costs = 0;
-			System.out.format(leftAlgin, routeNu, route.getVehicle().getId(), route.getStart().getName(), "-", "undef", Math.round(route.getStart().getEndTime()),Math.round(costs));
+			System.out.format(leftAlgin, routeNu, getVehicleString(route), route.getStart().getName(), "-", "undef", Math.round(route.getStart().getEndTime()),Math.round(costs));
 			TourActivity prevAct = route.getStart();
 			for(TourActivity act : route.getActivities()){
 				String jobId;
@@ -118,18 +119,26 @@ public class SolutionPrinter {
 				double c = problem.getTransportCosts().getTransportCost(prevAct.getLocationId(), act.getLocationId(), prevAct.getEndTime(), route.getDriver(), route.getVehicle());
 				c+= problem.getActivityCosts().getActivityCost(act, act.getArrTime(), route.getDriver(), route.getVehicle());
 				costs+=c;
-				System.out.format(leftAlgin, routeNu, route.getVehicle().getId(), act.getName(), jobId, Math.round(act.getArrTime()), Math.round(act.getEndTime()),Math.round(costs));
+				System.out.format(leftAlgin, routeNu, getVehicleString(route), act.getName(), jobId, Math.round(act.getArrTime()), Math.round(act.getEndTime()),Math.round(costs));
 				prevAct=act;
 			}
 			double c = problem.getTransportCosts().getTransportCost(prevAct.getLocationId(), route.getEnd().getLocationId(), prevAct.getEndTime(), route.getDriver(), route.getVehicle());
 			c+= problem.getActivityCosts().getActivityCost(route.getEnd(), route.getEnd().getArrTime(), route.getDriver(), route.getVehicle());
 			costs+=c;
-			System.out.format(leftAlgin, routeNu, route.getVehicle().getId(), route.getEnd().getName(), "-", Math.round(route.getEnd().getArrTime()), "undef", Math.round(costs));
+			System.out.format(leftAlgin, routeNu, getVehicleString(route), route.getEnd().getName(), "-", Math.round(route.getEnd().getArrTime()), "undef", Math.round(costs));
 			routeNu++;
 		}
+		System.out.format("+*:=PenaltyVehicle+%n");
 		System.out.format("+--------------------------------------------------------------------------------------------------------------------------------+%n");
 	}
 
+	private static String getVehicleString(VehicleRoute route) {
+		if(route.getVehicle().getType() instanceof PenaltyVehicleType){
+			return route.getVehicle().getId()+"*";
+		}
+		return route.getVehicle().getId();
+	}
+
 	private static Jobs getNuOfJobs(VehicleRoutingProblem problem) {
 		int nShipments = 0;
 		int nServices = 0;