From 6e6deef5774f47d2db409a8f124676fd3b8e12ce Mon Sep 17 00:00:00 2001 From: oblonski <4sschroeder@gmail.com> Date: Mon, 17 Feb 2014 15:22:22 +0100 Subject: [PATCH] tested multiple cap-dims for VrpXMLReader --- .../jsprit/core/problem/io/VrpXMLReader.java | 23 ++++++++----------- .../core/problem/io/VrpReaderV2Test.java | 10 ++++---- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/jsprit-core/src/main/java/jsprit/core/problem/io/VrpXMLReader.java b/jsprit-core/src/main/java/jsprit/core/problem/io/VrpXMLReader.java index 3dd7aea7..21cbbcf0 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/io/VrpXMLReader.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/io/VrpXMLReader.java @@ -239,11 +239,6 @@ public class VrpXMLReader{ String end = routeConfig.getString("end"); if(end == null) throw new IllegalStateException("route end-time is missing."); -// Start startAct = Start.newInstance(vehicle.getLocationId(), vehicle.getEarliestDeparture(), vehicle.getLatestArrival()); -// startAct.setEndTime(Double.parseDouble(start)); -// End endAct = End.newInstance(vehicle.getLocationId(), vehicle.getEarliestDeparture(), vehicle.getLatestArrival()); -// endAct.setArrTime(Double.parseDouble(end)); - VehicleRoute.Builder routeBuilder = VehicleRoute.Builder.newInstance(vehicle, driver); routeBuilder.setDepartureTime(departureTime); routeBuilder.setRouteEndArrivalTime(Double.parseDouble(end)); @@ -332,10 +327,10 @@ public class VrpXMLReader{ } else { builder = Shipment.Builder.newInstance(id); - List dimensionConfigs = shipmentConfig.configurationsAt("capacity-dimensions"); + List dimensionConfigs = shipmentConfig.configurationsAt("capacity-dimensions.dimension"); for(HierarchicalConfiguration dimension : dimensionConfigs){ - Integer index = dimension.getInt("dimension[@index]"); - Integer value = dimension.getInt("dimension"); + Integer index = dimension.getInt("[@index]"); + Integer value = dimension.getInt(""); builder.addCapacityDimension(index, value); } } @@ -441,10 +436,10 @@ public class VrpXMLReader{ } else { builder = serviceBuilderFactory.createBuilder(type, id, null); - List dimensionConfigs = serviceConfig.configurationsAt("capacity-dimensions"); + List dimensionConfigs = serviceConfig.configurationsAt("capacity-dimensions.dimension"); for(HierarchicalConfiguration dimension : dimensionConfigs){ - Integer index = dimension.getInt("dimension[@index]"); - Integer value = dimension.getInt("dimension"); + Integer index = dimension.getInt("[@index]"); + Integer value = dimension.getInt(""); builder.addCapacityDimension(index, value); } } @@ -501,10 +496,10 @@ public class VrpXMLReader{ } else { typeBuilder = VehicleTypeImpl.Builder.newInstance(typeId); - List dimensionConfigs = typeConfig.configurationsAt("capacity-dimensions"); + List dimensionConfigs = typeConfig.configurationsAt("capacity-dimensions.dimension"); for(HierarchicalConfiguration dimension : dimensionConfigs){ - Integer index = dimension.getInt("dimension[@index]"); - Integer value = dimension.getInt("dimension"); + Integer index = dimension.getInt("[@index]"); + Integer value = dimension.getInt(""); typeBuilder.addCapacityDimension(index, value); } } diff --git a/jsprit-core/src/test/java/jsprit/core/problem/io/VrpReaderV2Test.java b/jsprit-core/src/test/java/jsprit/core/problem/io/VrpReaderV2Test.java index 4767c197..53384ea0 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/io/VrpReaderV2Test.java +++ b/jsprit-core/src/test/java/jsprit/core/problem/io/VrpReaderV2Test.java @@ -432,12 +432,12 @@ public class VrpReaderV2Test { new VrpXMLReader(builder, null).read(inFileName); VehicleRoutingProblem vrp = builder.build(); Vehicle v = getVehicle("v5",vrp.getVehicles()); -// assertEquals(100, v.getType().getCapacityDimensions().get(0)); + assertEquals(100, v.getType().getCapacityDimensions().get(0)); assertEquals(1000, v.getType().getCapacityDimensions().get(1)); -// assertEquals(10000, v.getType().getCapacityDimensions().get(2)); -// assertEquals(0, v.getType().getCapacityDimensions().get(3)); -// assertEquals(0, v.getType().getCapacityDimensions().get(5)); -// assertEquals(100000, v.getType().getCapacityDimensions().get(10)); + assertEquals(10000, v.getType().getCapacityDimensions().get(2)); + assertEquals(0, v.getType().getCapacityDimensions().get(3)); + assertEquals(0, v.getType().getCapacityDimensions().get(5)); + assertEquals(100000, v.getType().getCapacityDimensions().get(10)); }