Added diesel as parametrized test

Author: Aleksander1234519

contribs/emissions/src/test/java/org/matsim/contrib/emissions/PHEMTest.java

@@ -6,6 +6,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.matsim.api.core.v01.Coord;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
@@ -79,7 +81,7 @@ private static List<DrivingCycleSecond> readCycle(Path path){
 		return drivingCycleSeconds;
 	}
 
-	/**
+	/** TODO Remove
 	 * Reads a csv (header: time,speed,acceleration) containing a wltp cycle and converts it into a MATSim test-network, with links representing the
 	 * phases of the cycle. The first link has its origin at (0,0) and the test-track extends into positive x.
 	 * @param network Network to put in the links
@@ -354,8 +356,9 @@ private void testValueDeviation(List<WLTPLinkComparison> refComparison, List<WLT
 	}
 
 	// TODO Petrol and diesel
-	@Test
-	public void test() throws IOException, URISyntaxException {
+	@ParameterizedTest
+	@ValueSource(strings = {"petrol", "diesel"}) // TODO Add diesel
+	public void test(String fuel) throws IOException, URISyntaxException {
 		// Prepare emission-config
 		EmissionsConfigGroup ecg = new EmissionsConfigGroup();
 		ecg.setHbefaVehicleDescriptionSource( EmissionsConfigGroup.HbefaVehicleDescriptionSource.usingVehicleTypeId );
@@ -377,14 +380,22 @@ public void test() throws IOException, URISyntaxException {
 		wltpLinkAttributes.add(new WLTPLinkAttributes(455, 7158, 27.06, "RUR/MW/100"));
 		wltpLinkAttributes.add(new WLTPLinkAttributes(323, 8254, 36.47, "RUR/MW/130"));
 
-		Path dir = Paths.get(utils.getClassInputDirectory()).resolve("sumo_petrol_output.csv");
+		Path dir = Paths.get(utils.getClassInputDirectory()).resolve("sumo_" + fuel + "_output.csv");
 		List<PHEMTest.SumoEntry> sumoSegments = readSumoEmissionsForLinks(dir, wltpLinkAttributes);
 
 		// Define vehicle
 		HbefaVehicleAttributes vehicleAttributes = new HbefaVehicleAttributes();
-		vehicleAttributes.setHbefaTechnology("petrol (4S)");
-		vehicleAttributes.setHbefaSizeClass("average");
-		vehicleAttributes.setHbefaEmConcept("PC P Euro-4");
+		switch(fuel){
+			case "petrol":
+				vehicleAttributes.setHbefaTechnology("petrol (4S)");
+				vehicleAttributes.setHbefaEmConcept("PC P Euro-4");
+				break;
+			case "diesel":
+				vehicleAttributes.setHbefaTechnology("diesel");
+				vehicleAttributes.setHbefaEmConcept("PC D Euro-4");
+				break;
+		}
+		vehicleAttributes.setHbefaSizeClass("average"); // TODO Fix table for final tests
 		Tuple<HbefaVehicleCategory, HbefaVehicleAttributes> vehHbefaInfo = new Tuple<>(
 			HbefaVehicleCategory.PASSENGER_CAR,
 			vehicleAttributes);
@@ -459,7 +470,7 @@ public void test() throws IOException, URISyntaxException {
 
 		// Print out the results as csv
 		CSVPrinter writer = new CSVPrinter(
-			IOUtils.getBufferedWriter(utils.getOutputDirectory() + "diff_out.csv"),
+			IOUtils.getBufferedWriter(utils.getOutputDirectory() + "diff_" + fuel + "_out.csv"),
 			CSVFormat.DEFAULT);
 		writer.printRecord(
 			"segment",
@@ -490,8 +501,8 @@ public void test() throws IOException, URISyntaxException {
 		for(int i = 0; i < comparison.size(); i++){
 			writer.printRecord(
 				i,
-				currentSecond,
-				wltpLinkAttributes.get(i).time,
+				comparison.get(i).startTime,
+				comparison.get(i).travelTime,
 
 				comparison.get(i).CO[0],
 				comparison.get(i).CO[1],
@@ -523,7 +534,7 @@ public void test() throws IOException, URISyntaxException {
 		writer.close();
 
 		// Start the tests
-		var refComparison = readReferenceComparison(Paths.get(utils.getClassInputDirectory()).resolve("diff_ref.csv"));
+		var refComparison = readReferenceComparison(Paths.get(utils.getClassInputDirectory()).resolve("diff_" + fuel + "_ref.csv"));
 		testHbefaV4_1(refComparison, comparison);
 		testValueDeviation(refComparison, comparison);
 

contribs/emissions/test/input/org/matsim/contrib/emissions/PHEMTest/diff_diesel_ref.csv

@@ -0,0 +1,5 @@
+segment,startTime,travelTime,CO-SUMO,CO-MATSIM,CO-Diff,CO-Factor,CO2(total)-SUMO,CO2(total)-MATSIM,CO2(total)-Diff,CO2(total)-Factor,HC-SUMO,HC-MATSIM,HC-Diff,HC-Factor,PM-SUMO,PM-MATSIM,PM-Diff,PM-Factor,NOx-SUMO,NOx-MATSIM,NOx-Diff,NOx-Factor
+0,0,589,0.13025138099999964,0.3479417357734158,0.21769035477341617,2.6713093796173784,800.7065299999956,726.4132637998139,-74.29326620018173,0.9072153611633689,0.054602330999999615,0.05982763886608032,0.005225307866080706,1.09569752372075,0.08597740400000044,0.011048610424985485,-0.07492879357501495,0.12850597844272466,2.130117029999998,3.8686546583493806,1.7385376283493827,1.816170005621421
+1,589,433,0.1424366559999998,0.2053815295995586,0.0629448735995588,1.441914850904383,858.9424699999976,810.2786741829435,-48.66379581705405,0.9433445224602129,0.05233332699999986,0.05280882079463716,4.7549379463730085E-4,1.0090858697869007,0.0947195160000001,0.009512646363850968,-0.08520686963614914,0.10042963441505505,2.4704269699999917,4.117255044115569,1.6468280741155774,1.6666167808699008
+2,1022,455,0.17994552359999988,0.21762120753921013,0.03767568393921025,1.209372721173989,1095.9917719999974,1243.44905182539,147.45727982539256,1.134542323758789,0.06334400579999994,0.06741674235691339,0.004072736556913453,1.064295532078798,0.12150918860000007,0.01281273381929844,-0.10869645478070163,0.1054466247937601,3.3061330299999936,6.326646606714195,3.020513576714201,1.9136092072841384
+3,1477,323,0.1857866625999999,0.1534797159985179,-0.032306946601482006,0.8261072880616888,1302.049182,1717.9463455878329,415.8971635878329,1.3194173993865563,0.05734918029999998,0.0661755118134583,0.00882633151345831,1.1539051032165897,0.14105709060000005,0.014762538231310315,-0.12629455236868972,0.10465647751925425,4.97468396,12.195900705270041,7.221216745270041,2.4515930666819767