From 8b01497cfc2608377caf75fa073edd9b37b4d928 Mon Sep 17 00:00:00 2001
From: oblonski <4sschroeder@gmail.com>
Date: Fri, 21 Jun 2013 02:51:34 +0200
Subject: [PATCH] adapt readers to changes in VehicleTypeBuilder and
 PenaltyVehicleType

---
 .../main/java/readers/ChristophidesReader.java   |  2 +-
 .../src/main/java/readers/CordeauReader.java     | 16 ++++++++--------
 .../src/main/java/readers/LuiShenReader.java     |  2 +-
 .../src/main/java/readers/SolomonReader.java     |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/jsprit-instances/src/main/java/readers/ChristophidesReader.java b/jsprit-instances/src/main/java/readers/ChristophidesReader.java
index fdc82879..15aa5325 100644
--- a/jsprit-instances/src/main/java/readers/ChristophidesReader.java
+++ b/jsprit-instances/src/main/java/readers/ChristophidesReader.java
@@ -93,7 +93,7 @@ public class ChristophidesReader {
 			else if(counter == 1){
 				String id = Integer.valueOf(counter).toString();
 				Coordinate depotCoord = makeCoord(tokens[0].trim(),tokens[1].trim());
-				VehicleTypeImpl vehicleType = VehicleType.Builder.newInstance("christophidesType", vehicleCapacity).
+				VehicleTypeImpl vehicleType = VehicleTypeImpl.Builder.newInstance("christophidesType", vehicleCapacity).
 						setCostPerDistance(1.0).setFixedCost(100).build();
 				Vehicle vehicle = VehicleImpl.Builder.newInstance("christophidesVehicle").setLatestArrival(endTime).setLocationId(id).setLocationCoord(depotCoord).
 						setType(vehicleType).build();
diff --git a/jsprit-instances/src/main/java/readers/CordeauReader.java b/jsprit-instances/src/main/java/readers/CordeauReader.java
index eebde2c0..f557512b 100644
--- a/jsprit-instances/src/main/java/readers/CordeauReader.java
+++ b/jsprit-instances/src/main/java/readers/CordeauReader.java
@@ -34,6 +34,7 @@ import readers.CordeauReader;
 import util.Coordinate;
 
 import basics.VehicleRoutingProblem.FleetSize;
+import basics.route.PenaltyVehicleType;
 import basics.route.VehicleImpl;
 import basics.route.VehicleImpl.Builder;
 import basics.route.VehicleType;
@@ -101,7 +102,7 @@ public class CordeauReader {
 				int duration = Integer.parseInt(tokens[0].trim());
 				if(duration == 0) duration = 999999;
 				int capacity = Integer.parseInt(tokens[1].trim());
-				VehicleTypeImpl vehicleType = VehicleType.Builder.newInstance(counter + "_cordeauType", capacity).
+				VehicleTypeImpl vehicleType = VehicleTypeImpl.Builder.newInstance(counter + "_cordeauType", capacity).
 						setCostPerDistance(1.0).setFixedCost(0).build();
 				List<Builder> builders = new ArrayList<VehicleImpl.Builder>();
 				for(int vehicleCounter=0;vehicleCounter<nOfVehiclesAtEachDepot;vehicleCounter++){
@@ -125,22 +126,21 @@ public class CordeauReader {
 				int cap = 0;
 				double latestArrTime = 0.0;
 				Coordinate coord = null;
+				String typeId = null;
 				for(Builder vBuilder : vBuilders){
 					vBuilder.setLocationCoord(depotCoord);
 					VehicleImpl vehicle = vBuilder.build();
 					cap = vehicle.getCapacity();
+					typeId = vehicle.getType().getTypeId();
 					latestArrTime = vehicle.getLatestArrival();
 					coord = vehicle.getCoord();
 					vrpBuilder.addVehicle(vehicle);
 				}
 				if(addPenaltyVehicles){
-					for(int i=0;i<5;i++){
-						VehicleTypeImpl penaltyType = VehicleType.Builder.newInstance(counter + "_penaltyType", cap).
-								setCostPerDistance(3.0).setFixedCost(50).build();
-						VehicleImpl penaltyVehicle = VehicleImpl.Builder.newInstance(counter + "_" + (i+1) + "_penaltyVehicle").setLatestArrival(latestArrTime)
-								.setType(penaltyType).setLocationCoord(coord).build();
-						vrpBuilder.addVehicle(penaltyVehicle);
-					}
+					VehicleTypeImpl penaltyType = VehicleTypeImpl.Builder.newInstance(typeId, cap).setCostPerDistance(3.0).setFixedCost(50).build();
+					VehicleImpl penaltyVehicle = VehicleImpl.Builder.newInstance(counter + "_penaltyVehicle").setLatestArrival(latestArrTime)
+							.setType(new PenaltyVehicleType(penaltyType)).setLocationCoord(coord).build();
+					vrpBuilder.addVehicle(penaltyVehicle);
 				}
 				depotCounter++;
 			}
diff --git a/jsprit-instances/src/main/java/readers/LuiShenReader.java b/jsprit-instances/src/main/java/readers/LuiShenReader.java
index 08b010e5..6c0ed22a 100644
--- a/jsprit-instances/src/main/java/readers/LuiShenReader.java
+++ b/jsprit-instances/src/main/java/readers/LuiShenReader.java
@@ -123,7 +123,7 @@ public class LuiShenReader {
 			int capacity = Integer.parseInt(tokens[capacityColumn]);
 			int fixCost = Integer.parseInt(tokens[costScenarioColumn]);
 			
-			VehicleTypeImpl.Builder typeBuilder = VehicleType.Builder.newInstance(vehicleId, capacity);
+			VehicleTypeImpl.Builder typeBuilder = VehicleTypeImpl.Builder.newInstance(vehicleId, capacity);
 			typeBuilder.setFixedCost(fixCost).setCostPerDistance(1.0);
 			
 			VehicleTypeImpl type = typeBuilder.build();
diff --git a/jsprit-instances/src/main/java/readers/SolomonReader.java b/jsprit-instances/src/main/java/readers/SolomonReader.java
index 4dda759c..936d4f62 100644
--- a/jsprit-instances/src/main/java/readers/SolomonReader.java
+++ b/jsprit-instances/src/main/java/readers/SolomonReader.java
@@ -97,7 +97,7 @@ public class SolomonReader {
 				double end = Double.parseDouble(tokens[5])*timeProjectionFactor;
 				double serviceTime = Double.parseDouble(tokens[6])*timeProjectionFactor;
 				if(counter == 10){
-					VehicleTypeImpl.Builder typeBuilder = VehicleType.Builder.newInstance("solomonType", vehicleCapacity);
+					VehicleTypeImpl.Builder typeBuilder = VehicleTypeImpl.Builder.newInstance("solomonType", vehicleCapacity);
 					typeBuilder.setCostPerDistance(1.0*variableCostProjectionFactor).setFixedCost(100);
 					
 					VehicleTypeImpl vehicleType = typeBuilder.build();