Merge pull request #3621 from matsim-org/addVehicleTypeToFreightLoadA…

…nalysis add vehicleType to carrier load analysis
matsim-org · Dec 3, 2024 · 3617d8e · 3617d8e
2 parents 994ebf5 + 709a743
commit 3617d8e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/contribs/freight/src/main/java/org/matsim/freight/carriers/analysis/CarrierLoadAnalysis.java b/contribs/freight/src/main/java/org/matsim/freight/carriers/analysis/CarrierLoadAnalysis.java
@@ -95,6 +95,7 @@ void writeLoadPerVehicle(String analysisOutputDirectory, Scenario scenario) thro
 
 		//Write headline:
 		bw1.write(String.join(delimiter,"vehicleId",
+			"vehicleTypeId",
 			"capacity",
 			"maxLoad",
 			"load state during tour"));
@@ -109,6 +110,7 @@ void writeLoadPerVehicle(String analysisOutputDirectory, Scenario scenario) thro
 			final Double capacity = vehicleType.getCapacity().getOther();
 
 			bw1.write(vehicleId.toString());
+			bw1.write(delimiter + vehicleType.getId().toString());
 			bw1.write(delimiter + capacity);
 			bw1.write(delimiter + maxLoad);
 			bw1.write(delimiter + load);

diff --git a/...t/carriers/analysis/FreightAnalysisEventBasedTest/runServiceEventTest/Load_perVehicle.tsv b/...t/carriers/analysis/FreightAnalysisEventBasedTest/runServiceEventTest/Load_perVehicle.tsv
@@ -1 +1 @@
-vehicleId	capacity	maxLoad	load state during tour
+vehicleId	vehicleTypeId	capacity	maxLoad	load state during tour
diff --git a/.../carriers/analysis/FreightAnalysisEventBasedTest/runShipmentEventTest/Load_perVehicle.tsv b/.../carriers/analysis/FreightAnalysisEventBasedTest/runShipmentEventTest/Load_perVehicle.tsv
@@ -1,2 +1,2 @@
-vehicleId	capacity	maxLoad	load state during tour
-freight_carrier1_veh_freight_carrier1_veh_heavyVehicle_1_1	50.0	26	[3, 8, 18, 25, 26, 23, 13, 12, 7, 0]
+vehicleId	vehicleTypeId	capacity	maxLoad	load state during tour
+freight_carrier1_veh_freight_carrier1_veh_heavyVehicle_1_1	heavy	50.0	26	[3, 8, 18, 25, 26, 23, 13, 12, 7, 0]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		vehicleId capacity maxLoad load state during tour
		vehicleId vehicleTypeId capacity maxLoad load state during tour