From dd5d3f3149652ed1d94a78aa133bac538fc20648 Mon Sep 17 00:00:00 2001
From: Ricardo Ewert <ewert@vsp.tu-berlin.de>
Date: Wed, 28 Aug 2024 13:47:38 +0200
Subject: [PATCH] fix hbefa setting for commercial vehicles

---
 .../metropole-ruhr-v2.0.mode-vehicles.xml     | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0.mode-vehicles.xml b/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0.mode-vehicles.xml
index 7d9a612..21af330 100644
--- a/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0.mode-vehicles.xml
+++ b/scenarios/metropole-ruhr-v2.0/input/metropole-ruhr-v2.0.mode-vehicles.xml
@@ -62,9 +62,9 @@
 		<engineInformation>
 			<attributes>
 				<attribute name="HbefaVehicleCategory" class="java.lang.String">PASSENGER_CAR</attribute>
-				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">petrol</attribute>
 				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
-				<attribute name="HbefaEmissionsConcept" class="java.lang.String">petrol (4S)</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">average</attribute>
 			</attributes>
 		</engineInformation>
 		<costInformation fixedCostsPerDay="31.07" costsPerMeter="1.5E-4" costsPerSecond="0.0049">
@@ -88,9 +88,9 @@
 		<engineInformation>
 			<attributes>
 				<attribute name="HbefaVehicleCategory" class="java.lang.String">PASSENGER_CAR</attribute>
-				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">diesel</attribute>
 				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
-				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">average</attribute>
 			</attributes>
 		</engineInformation>
 		<costInformation fixedCostsPerDay="27.27" costsPerMeter="1.7E-4" costsPerSecond="0.0049">
@@ -114,9 +114,9 @@
 		<engineInformation>
 			<attributes>
 				<attribute name="HbefaVehicleCategory" class="java.lang.String">LIGHT_COMMERCIAL_VEHICLE</attribute>
-				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">diesel</attribute>
 				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
-				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">average</attribute>
 			</attributes>
 		</engineInformation>
 		<costInformation fixedCostsPerDay="36.42" costsPerMeter="2.6E-4" costsPerSecond="0.0049">
@@ -139,9 +139,9 @@
 		<engineInformation>
 			<attributes>
 				<attribute name="HbefaVehicleCategory" class="java.lang.String">LIGHT_COMMERCIAL_VEHICLE</attribute>
-				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">diesel</attribute>
 				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
-				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">average</attribute>
 			</attributes>
 		</engineInformation>
 		<costInformation fixedCostsPerDay="36.42" costsPerMeter="2.6E-4" costsPerSecond="0.0049">
@@ -165,9 +165,9 @@
 		<engineInformation>
 			<attributes>
 				<attribute name="HbefaVehicleCategory" class="java.lang.String">LIGHT_COMMERCIAL_VEHICLE</attribute>
-				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">diesel</attribute>
 				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
-				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">average</attribute>
 			</attributes>
 		</engineInformation>
 		<costInformation fixedCostsPerDay="63.49" costsPerMeter="4.0E-4" costsPerSecond="0.0049">
@@ -190,9 +190,9 @@
 		<engineInformation>
 			<attributes>
 				<attribute name="HbefaVehicleCategory" class="java.lang.String">HEAVY_GOODS_VEHICLE</attribute>
-				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">diesel</attribute>
 				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
-				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">average</attribute>
 			</attributes>
 		</engineInformation>
 		<costInformation fixedCostsPerDay="80.47" costsPerMeter="5.3E-4" costsPerSecond="0.0049">
@@ -215,9 +215,9 @@
 		<engineInformation>
 			<attributes>
 				<attribute name="HbefaVehicleCategory" class="java.lang.String">HEAVY_GOODS_VEHICLE</attribute>
-				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">diesel</attribute>
 				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
-				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">average</attribute>
 			</attributes>
 		</engineInformation>
 		<costInformation fixedCostsPerDay="80.47" costsPerMeter="5.3E-4" costsPerSecond="0.0049">
@@ -240,9 +240,9 @@
 		<engineInformation>
 			<attributes>
 				<attribute name="HbefaVehicleCategory" class="java.lang.String">HEAVY_GOODS_VEHICLE</attribute>
-				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">diesel</attribute>
 				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
-				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">average</attribute>
 			</attributes>
 		</engineInformation>
 		<costInformation fixedCostsPerDay="126.58" costsPerMeter="6.9E-4" costsPerSecond="0.00559">
@@ -265,9 +265,9 @@
 		<engineInformation>
 			<attributes>
 				<attribute name="HbefaVehicleCategory" class="java.lang.String">HEAVY_GOODS_VEHICLE</attribute>
-				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">diesel</attribute>
 				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
-				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">average</attribute>
 			</attributes>
 		</engineInformation>
 		<costInformation fixedCostsPerDay="126.58" costsPerMeter="6.9E-4" costsPerSecond="0.00559">
@@ -287,10 +287,12 @@
 		<maximumVelocity meterPerSecond="22.22"/>
 		<engineInformation>
 			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">HEAVY_GOODS_VEHICLE</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">diesel</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">average</attribute>
 				<attribute name="fuelConsumptionPerTonnePickupWaste" class="java.lang.Double">0.5</attribute>
-				<attribute name="fuelConsumptionPerKm" class="java.lang.Double">60.0</attribute>
-				<attribute name="fuelType" class="java.lang.String">diesel</attribute>
-				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+				<attribute name="fuelConsumptionLitersPerMeter" class="java.lang.Double">0.0006</attribute>
 			</attributes>
 		</engineInformation>
 		<costInformation fixedCostsPerDay="982.98" costsPerMeter="8.46E-4" costsPerSecond="0.0">