diff --git a/scenarios/wasteCollection/Berlin/vehicleTypes.xml b/scenarios/wasteCollection/Berlin/vehicleTypes.xml
deleted file mode 100644
index cfb7b87..0000000
--- a/scenarios/wasteCollection/Berlin/vehicleTypes.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- 0.5
- 60.0
- diesel
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 80.0
- 1.4
- 1.0
- electricity
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 310.0
- 1.4
- 1.0
- electricity
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/scenarios/wasteCollection/Vulkaneifel/vehicles/vehicleTypes.xml b/scenarios/wasteCollection/Vulkaneifel/vehicles/vehicleTypes.xml
deleted file mode 100644
index 679966c..0000000
--- a/scenarios/wasteCollection/Vulkaneifel/vehicles/vehicleTypes.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- 0.5
- 60.0
- diesel
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 80.0
- 1.4
- 1.0
- electricity
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 310.0
- 1.4
- 1.0
- electricity
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/scenarios/wasteCollection/Vulkaneifel/vehicles/vehicleTypes_new.xml b/scenarios/wasteCollection/vehicleTypes.xml
similarity index 91%
rename from scenarios/wasteCollection/Vulkaneifel/vehicles/vehicleTypes_new.xml
rename to scenarios/wasteCollection/vehicleTypes.xml
index 022e8e2..d5d427c 100644
--- a/scenarios/wasteCollection/Vulkaneifel/vehicles/vehicleTypes_new.xml
+++ b/scenarios/wasteCollection/vehicleTypes.xml
@@ -31,7 +31,7 @@
- 125.0
+ 122.8
1.4
0.001
electricity
@@ -55,7 +55,7 @@
- 310.0
+ 280.6
1.4
0.001
electricity
diff --git a/src/main/java/org/matsim/vsp/wasteCollection/Berlin/Run_Abfall.java b/src/main/java/org/matsim/vsp/wasteCollection/Berlin/Run_Abfall.java
index 1b309aa..a6306ff 100644
--- a/src/main/java/org/matsim/vsp/wasteCollection/Berlin/Run_Abfall.java
+++ b/src/main/java/org/matsim/vsp/wasteCollection/Berlin/Run_Abfall.java
@@ -34,7 +34,7 @@ public class Run_Abfall {
private static final String original_Chessboard = "https://raw.githubusercontent.com/matsim-org/matsim/master/examples/scenarios/freight-chessboard-9x9/grid9x9.xml";
private static final String berlin = "https://svn.vsp.tu-berlin.de/repos/public-svn/matsim/scenarios/countries/de/berlin/berlin-v5.2-1pct/output-berlin-v5.2-1pct/berlin-v5.2-1pct.output_network.xml.gz";
private static final String berlinDistrictsWithGarbageInformations = "scenarios/wasteCollection/Berlin/garbageInput/districtsWithGarbageInformations.shp";
- private static final String inputVehicleTypes = "scenarios/wasteCollection/Berlin/vehicleTypes.xml";
+ private static final String inputVehicleTypes = "scenarios/wasteCollection/vehicleTypes.xml";
private static final String inputCarriersWithDieselVehicle = "scenarios/wasteCollection/Berlin/carriers_diesel_vehicle.xml";
private static final String inputCarriersWithMediumBatteryVehicle = "scenarios/wasteCollection/Berlin/carriers_medium_EV.xml";
private static final String inputCarriersWithSmallBatteryVehicle = "scenarios/wasteCollection/Berlin/carriers_small_EV.xml";
diff --git a/src/main/java/org/matsim/vsp/wasteCollection/Vulkaneifel/run/AbfallUtils.java b/src/main/java/org/matsim/vsp/wasteCollection/Vulkaneifel/run/AbfallUtils.java
index 2dd0c31..0b0bded 100644
--- a/src/main/java/org/matsim/vsp/wasteCollection/Vulkaneifel/run/AbfallUtils.java
+++ b/src/main/java/org/matsim/vsp/wasteCollection/Vulkaneifel/run/AbfallUtils.java
@@ -36,9 +36,7 @@ public class AbfallUtils {
static String linkDepotPlaidt = "5574439310007f";
static String linkDepotHetzerath = "3118011660035f";
- static String carrierVehicleTypesFilePath = "scenarios/wasteCollection/Vulkaneifel/vehicles/vehicleTypes_new.xml";
-
- static Config prepareConfig(String output, String networkPath) {
+ static Config prepareConfig(String output, String networkPath, String vehicleTypesFilePath) {
Config config = ConfigUtils.createConfig();
config.routing().setNetworkRouteConsistencyCheck(RoutingConfigGroup.NetworkRouteConsistencyCheck.disable);
config.global().setCoordinateSystem("EPSG:25832");
@@ -47,8 +45,8 @@ static Config prepareConfig(String output, String networkPath) {
config.controller().setOverwriteFileSetting(OutputDirectoryHierarchy.OverwriteFileSetting.overwriteExistingFiles);
FreightCarriersConfigGroup freightCarriersConfigGroup = ConfigUtils.addOrGetModule(config, FreightCarriersConfigGroup.class);
- log.info("Read carrier vehicle types from: {}", carrierVehicleTypesFilePath);
- freightCarriersConfigGroup.setCarriersVehicleTypesFile(carrierVehicleTypesFilePath);
+ log.info("Read carrier vehicle types from: {}", vehicleTypesFilePath);
+ freightCarriersConfigGroup.setCarriersVehicleTypesFile(vehicleTypesFilePath);
log.info("Read network from: {}", networkPath);
config.network().setInputFile(networkPath);
diff --git a/src/main/java/org/matsim/vsp/wasteCollection/Vulkaneifel/run/RunWasteCollectionVulkaneifel.java b/src/main/java/org/matsim/vsp/wasteCollection/Vulkaneifel/run/RunWasteCollectionVulkaneifel.java
index 99e91a3..4f2c2eb 100644
--- a/src/main/java/org/matsim/vsp/wasteCollection/Vulkaneifel/run/RunWasteCollectionVulkaneifel.java
+++ b/src/main/java/org/matsim/vsp/wasteCollection/Vulkaneifel/run/RunWasteCollectionVulkaneifel.java
@@ -77,6 +77,10 @@ enum VehicleFleet {
defaultValue = "scenarios/wasteCollection/Vulkaneifel/vulkaneifel_network_reduced.xml.gz")
private String networkPath;
+ @CommandLine.Option(names = "--vehicleTypesFile", description = "Path to the vehicle types file",
+ defaultValue = "scenarios/wasteCollection/vehicleTypes.xml")
+ static String vehicleTypesFilePath ;
+
public static void main(String[] args) {
System.exit(new CommandLine(new RunWasteCollectionVulkaneifel()).execute(args));
}
@@ -103,7 +107,7 @@ public Integer call() throws Exception {
String Output_suffix = "/" + weekday + "_" + weekRhythm + "_"+vehicleFleet + "_"+ "Iterations_"+ jspritIterations ;
output = output + Output_suffix;
- Config config = AbfallUtils.prepareConfig(output, networkPath);
+ Config config = AbfallUtils.prepareConfig(output, networkPath, vehicleTypesFilePath);
Scenario scenario = ScenarioUtils.loadScenario(config);
FreightCarriersConfigGroup freightCarriersConfigGroup = ConfigUtils.addOrGetModule(config, FreightCarriersConfigGroup.class);