diff --git a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx
index 976da45c3ddfc4a5b523450b93565fd27329b244..a1d70978cdf7eb51c2b53a30869e0c30477c8d69 100644
Binary files a/Documentation/User Manual Source/Release Notes Vecto3.x.pptx and b/Documentation/User Manual Source/Release Notes Vecto3.x.pptx differ
diff --git a/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md b/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md
index 438d3ba472f8c4fb9c8b142a5895987136d0c33e..cb1f6df41897422c52779397aeef4622d6f92f45 100644
--- a/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md
+++ b/Documentation/User Manual/3-simulation-models/Engine_FC_Correction.md
@@ -4,7 +4,7 @@ The final fuel consumption is corrected in a post-processing to reflect systems
###Engine Stop/Start Correction
-As the energy demand of auxiliaries is modeled as an average power demand over the whole simulated cycle, the energy demand of certain auxiliaries during engine-off periods needs to be compensated during engine-on periods. This is done using the [Vehicle-Line approach](##vehicle-line-approach). The energy demand of the auxiliaries that shall be active also during engine-off periods as well as the energy demand for starting the engine is accumulated (see [Engine Stop/Start](#advanced-driver-assistant-systems-engine-stopstart), [Eco-Roll with Engine Stop/Start](#advanced-driver-assistant-systems-eco-roll), and [PCC with Eco-Roll and Engine Stop/Start](#advanced-driver-assistant-systems-predictive-cruise-control)) during the simulation. The final fuel consumption is corrected for this "missing" energy
+As the energy demand of auxiliaries is modeled as an average power demand over the whole simulated cycle, the energy demand of certain auxiliaries during engine-off periods needs to be compensated during engine-on periods. This is done using the [Engine-Line approach](##engine-line-approach). The energy demand of the auxiliaries that shall be active also during engine-off periods as well as the energy demand for starting the engine is accumulated (see [Engine Stop/Start](#advanced-driver-assistant-systems-engine-stopstart), [Eco-Roll with Engine Stop/Start](#advanced-driver-assistant-systems-eco-roll), and [PCC with Eco-Roll and Engine Stop/Start](#advanced-driver-assistant-systems-predictive-cruise-control)) during the simulation. The final fuel consumption is corrected for this "missing" energy
###Bus Auxiliaries Correction
@@ -37,9 +37,9 @@ $\overline{P}_\textrm{ice,waste heat} = E_\textrm{ice, waste heat} / t_\textrm{c
$E_{auxHeater} = P_\textrm{HVACSSM,auxHtr}(\overline{P}_\textrm{ice,waste heat}) * t_\textrm{cycle}$
-###Vehicle-Line Approach
+###Engine-Line Approach
-The total fuel consumption is corrected in a post-processing step according to the *vehline* approach. Therefore, for every engine operating point where the engine is switched on and has a positive fuel consumption the fuel consumption is plotted over the engine power. The slope (k) of the linear regression of the fuel consumption is used to compute the additional fuel that is needed for the energy demand during engine-off periods and engine starts.
+The total fuel consumption is corrected in a post-processing step according to the *engine-line* approach. Therefore, for every engine operating point where the engine is switched on and has a positive fuel consumption the fuel consumption is plotted over the engine power. The slope (k) of the linear regression of the fuel consumption is used to compute the additional fuel that is needed for the energy demand during engine-off periods and engine starts.
diff --git a/Documentation/User Manual/5-input-and-output-files/VDRI.md b/Documentation/User Manual/5-input-and-output-files/VDRI.md
index 2028f2ca782c221717ddafbc26c72a9b27ed8ac2..0bc87ba8ec414849aa9cb00df73a99daa3baed9f 100644
--- a/Documentation/User Manual/5-input-and-output-files/VDRI.md
+++ b/Documentation/User Manual/5-input-and-output-files/VDRI.md
@@ -34,34 +34,34 @@ Header: **\<t>, \<v>, \<n\_eng>,\<n\_fan>, \<tq\_left>, \<tq\_right>, \<n\_wh\_l
**Bold columns** are mandatory. *Italic columns* are optional. Only the listed columns are allowed (no other columns!).<br />
Units are optional and are enclosed in [square-brackets] after the header-column. Comments may be written with a preceding hash-sign "#".
-| Identifier | Unit | Description |
-| ------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| **t** | [s] | The absolute time. Must always be increasing. |
-| **v** | [km/h] | The actual velocity of the vehicle. Must be >= 0 km/h. |
-| **n_eng** | [rpm] | The actual engine speed. Must be >= 0 rpm. |
-| **n_fan** | [rpm] | The actual engine-fan speed. Must be >= 0 rpm. |
-| **tq_left** | [Nm] | The actual torque at the driven wheel (left side) |
-| **tq_right** | [Nm] | The actual torque at the driven wheel (left side) |
-| **n_wh_left** | [rpm] | The actual wheel speed of the driven wheel (left side). Must be >= 0 rpm. |
-| **n_wh_right** | [rpm] | The actual wheel speed of the driven wheel (right side). Must be >= 0 rpm. |
-| *fc* | [g/h] | Fuel consumption |
-| *gear* | [-] | The actual gear |
+| Identifier | Unit | Description |
+| ------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| **t** | [s] | The absolute time. Must always be increasing. |
+| **v** | [km/h] | The actual velocity of the vehicle. Must be >= 0 km/h. |
+| **n_eng** | [rpm] | The actual engine speed. Must be >= 0 rpm. |
+| **n_fan** | [rpm] | The actual engine-fan speed. Must be >= 0 rpm. |
+| **tq_left** | [Nm] | The actual torque at the driven wheel (left side) |
+| **tq_right** | [Nm] | The actual torque at the driven wheel (left side) |
+| **n_wh_left** | [rpm] | The actual wheel speed of the driven wheel (left side). Must be >= 0 rpm. |
+| **n_wh_right** | [rpm] | The actual wheel speed of the driven wheel (right side). Must be >= 0 rpm. |
+| *fc_<Fuel Type>*| [g/h] | Fuel consumption, this column has to be provided for every fuel in case of dual-fuel vehicles |
+| *gear* | [-] | The actual gear |
**Example:**
-| \<t> [s] | \<v> [km/h] | \<n_eng> [rpm] | \<n_fan> [rpm] | \<tq_left> [Nm] | \<tq_right> [Nm] | \<n_wh_left> [rpm] | \<n_wh_right> [rpm] | \<fc> [g/h] | \<gear> |
-| --------- | ------------ | --------------- | --------------- | ---------------- | ----------------- | ------------------- | -------------------- | ------------ | -------- |
-| 0 | 0 | 599.7 | 727.3 | 319.1 | 429.8 | 0.78 | 0.78 | 836 | 3 |
-| 0.5 | 0 | 600.2 | 727.3 | 316.7 | 430.0 | 0.78 | 0.78 | 836 | 3 |
-| 1 | 0 | 600.1 | 726.9 | 319.9 | 430.8 | 0.78 | 0.78 | 836 | 3 |
-| 1.5 | 0 | 599.9 | 726.6 | 317.4 | 431.1 | 0.78 | 0.79 | 836 | 3 |
-| 2 | 0 | 600.1 | 726.2 | 319.5 | 421.7 | 0.78 | 0.78 | 836 | 3 |
-| 2.5 | 0 | 599.7 | 726 | 319.0 | 434.1 | 0.78 | 0.78 | 836 | 3 |
-| 3 | 0 | 600.2 | 725.4 | 322.2 | 428.5 | 0.78 | 0.78 | 836 | 3 |
-| 3.5 | 0 | 599.9 | 724.7 | 317.3 | 430.4 | 0.78 | 0.78 | 836 | 3 |
-| 4 | 0 | 599.5 | 724.0 | 320.9 | 428.0 | 0.78 | 0.78 | 836 | 3 |
-| 4.5 | 0 | 599.9 | 723.4 | 187.0 | 247.6 | 0.78 | 0.78 | 836 | 3 |
-| 5 | 0 | 598.7 | 722.5 | 156.9 | 171.5 | 0.78 | 0.78 | 1003.2 | 3 |
+| \<t> [s] | \<v> [km/h] | \<n_eng> [rpm] | \<n_fan> [rpm] | \<tq_left> [Nm] | \<tq_right> [Nm] | \<n_wh_left> [rpm] | \<n_wh_right> [rpm] | \<fc_Diesel CI> [g/h] | \<gear> |
+| --------- | ------------ | --------------- | --------------- | ---------------- | ----------------- | ------------------- | -------------------- | ------------ | -------- |
+| 0 | 0 | 599.7 | 727.3 | 319.1 | 429.8 | 0.78 | 0.78 | 836 | 3 |
+| 0.5 | 0 | 600.2 | 727.3 | 316.7 | 430.0 | 0.78 | 0.78 | 836 | 3 |
+| 1 | 0 | 600.1 | 726.9 | 319.9 | 430.8 | 0.78 | 0.78 | 836 | 3 |
+| 1.5 | 0 | 599.9 | 726.6 | 317.4 | 431.1 | 0.78 | 0.79 | 836 | 3 |
+| 2 | 0 | 600.1 | 726.2 | 319.5 | 421.7 | 0.78 | 0.78 | 836 | 3 |
+| 2.5 | 0 | 599.7 | 726 | 319.0 | 434.1 | 0.78 | 0.78 | 836 | 3 |
+| 3 | 0 | 600.2 | 725.4 | 322.2 | 428.5 | 0.78 | 0.78 | 836 | 3 |
+| 3.5 | 0 | 599.9 | 724.7 | 317.3 | 430.4 | 0.78 | 0.78 | 836 | 3 |
+| 4 | 0 | 599.5 | 724.0 | 320.9 | 428.0 | 0.78 | 0.78 | 836 | 3 |
+| 4.5 | 0 | 599.9 | 723.4 | 187.0 | 247.6 | 0.78 | 0.78 | 836 | 3 |
+| 5 | 0 | 598.7 | 722.5 | 156.9 | 171.5 | 0.78 | 0.78 | 1003.2 | 3 |
diff --git a/Documentation/User Manual/5-input-and-output-files/VSUM.md b/Documentation/User Manual/5-input-and-output-files/VSUM.md
index 70ef898aa0395be229daf83cf603945dff28a6cb..355d7bdcabdafbfa42eee80e0501dd564a5c9db3 100644
--- a/Documentation/User Manual/5-input-and-output-files/VSUM.md
+++ b/Documentation/User Manual/5-input-and-output-files/VSUM.md
@@ -31,7 +31,9 @@ The .vsum file includes total / average results for each calculation run in one
| FC-Final<\_FuelName> | [g/h], [g/km], [l/100km], [l/100tkm], [l/100m^3km] | Final average fuel consumption after ALL corrections (FC-Final = FC-ESS_Corr). Fuel consumption for calculation of CO~2~ value. If Loading = 0[kg] the column [l/100tkm] is left empty. |
| CO2 | [g/km], [g/tkm], [g/m^3km] | Average CO~2~ emissions (based on FC-Final value). Output for [l/100tkm] is empty when Loading = 0[kg]. |
| P_wheel_in_pos | [kW] | Average positive power at the wheels |
+| P_wheel_in | [kW] | Average power at the wheels |
| P_fcmap_pos | [kW] | Average positive power at engine (all non-negative values averaged over the whole cycle duration) |
+| P_fcmap_pos | [kW] | Average power at engine (both, positive and negative values, averaged over the whole cycle duration) |
| E_fcmap_pos | [kWh] | Total positive work provided by the combustion engine. |
| E_fcmap_neg | [kWh] | Total energy |
| E_powertrain_inertia | [kWh] | Total work of engine, torqueconverter, and gearbox inertia |
@@ -68,7 +70,8 @@ The .vsum file includes total / average results for each calculation run in one
| E_aux_ess_mech | [kWh] | Total work of auxiliaries during engine stop and thus not considered in FC-Map and FC-AAUX. Considered in FC-ESS_Corr via [fuel consumption correction](#engine-fuel-consumption-correction) (Based on P_aux_ESS_mech in .vmod) |
| E_ice_start | [kWh] | Total work for starting the combustion engine, not considered in FC-Map and FC-AAUX. Considered in FC-ESS_Corr via [fuel consumption correction](#engine-fuel-consumption-correction) (Based on P_ice_start in .vmod) |
| ice_starts | [-] | Number of times the combustion engine is started |
-| k_vehline | [g/kWh] | Slope of the regression line used for the [fuel consumption correction](#engine-fuel-consumption-correction) |
+| k_vehline | [g/kWh] | Slope of the regression line derived from all operating points P_wheel vs. FC_final_mod where P_wheel > 0 and FC_final_mod > 0 |
+| k_engline | [g/kWh] | Slope of the regression line used for the [fuel consumption correction](#engine-fuel-consumption-correction) |
| a | [m/s^2^] | Average acceleration |
| a_pos | [m/s^2^] | Average acceleration in acceleration phases (a~3s~ \> 0.125 \[m/s^2^\], a~3s~Â = 3-seconds-averaged acceleration) |
| a_neg | [m/s^2^] | Average deceleration in deceleration phases (a~3s~ \< 0.125 \[m/s^2^\], a~3s~Â = 3-seconds-averaged acceleration) |
diff --git a/Generic Vehicles/Declaration Mode/Completed 31b/CompletedBus_31b.vecto b/Generic Vehicles/Declaration Mode/CompletedBus 31b/CompletedBus_31b.vecto
similarity index 100%
rename from Generic Vehicles/Declaration Mode/Completed 31b/CompletedBus_31b.vecto
rename to Generic Vehicles/Declaration Mode/CompletedBus 31b/CompletedBus_31b.vecto
diff --git a/Generic Vehicles/Declaration Mode/Completed 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml
similarity index 86%
rename from Generic Vehicles/Declaration Mode/Completed 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml
rename to Generic Vehicles/Declaration Mode/CompletedBus 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml
index ca639ef812380b3c9e3ae469c591ca67be9009d3..033d7250d54768e4f76e348d034617a1f3882b8a 100644
--- a/Generic Vehicles/Declaration Mode/Completed 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b/primary_heavyBus group_P31_32_Smart_ES.PIF.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
- <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-031eec78fb1746d280d9">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-35d2c92f368748528f58">
<Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+ <ManufacturerPrimaryVehicle>Generic Bus Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
@@ -10,7 +10,7 @@
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
- <TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
+ <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>700</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
@@ -212,17 +212,17 @@
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>qbkrFYROE5tA+8PnYHcW9bd65Z8HWn1fCwMHHrtSqKY=</di:DigestValue>
+ <di:DigestValue>svVL/7eKMZ9ULNstW+bZeIpS8UXpNXpkxyWDtFD5QzU=</di:DigestValue>
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-6c34e6e3c0654ca2b66d">
+ <di:Reference URI="#RESULT-1bf4f0ed871443f4a122">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>5tgyq+cWmJLc6jGrNL+vrTKwUvPfffC9L2KQNsN5me0=</di:DigestValue>
+ <di:DigestValue>wBzAtyXjA+9GqsqTOzhR7u5J46ICG5qxMtHt2EslnBo=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -237,9 +237,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.39581</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.26127</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1421.75</CO2>
+ <CO2 unit="g/km">1411.89</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -251,9 +251,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">23.48056</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">23.36173</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1721.17</CO2>
+ <CO2 unit="g/km">1712.46</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -265,9 +265,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.90915</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.79525</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1166.17</CO2>
+ <CO2 unit="g/km">1157.82</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -279,9 +279,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.25350</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.17590</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1411.32</CO2>
+ <CO2 unit="g/km">1405.63</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -293,9 +293,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.61881</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.24764</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1071.59</CO2>
+ <CO2 unit="g/km">1044.38</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -307,9 +307,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.74669</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.32635</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1300.87</CO2>
+ <CO2 unit="g/km">1270.06</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -321,9 +321,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.82851</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.31731</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1453.47</CO2>
+ <CO2 unit="g/km">1489.30</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -335,9 +335,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">24.12659</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">24.95584</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1768.53</CO2>
+ <CO2 unit="g/km">1829.32</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -349,9 +349,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.37265</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.66413</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1200.15</CO2>
+ <CO2 unit="g/km">1221.52</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -363,9 +363,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.89387</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.46277</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1458.26</CO2>
+ <CO2 unit="g/km">1499.96</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -377,9 +377,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.18680</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.85984</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1113.22</CO2>
+ <CO2 unit="g/km">1089.26</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -391,37 +391,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">18.46135</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">18.25391</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1353.26</CO2>
+ <CO2 unit="g/km">1338.05</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
- <Payload unit="kg">1075.44</Payload>
- <PassengerCount>15.15</PassengerCount>
+ <TotalVehicleMass unit="kg">14029.90</TotalVehicleMass>
+ <Payload unit="kg">879.90</Payload>
+ <PassengerCount>12.39</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.39119</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.74380</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">981.60</CO2>
+ <CO2 unit="g/km">934.15</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">17451.75</TotalVehicleMass>
- <Payload unit="kg">4301.75</Payload>
- <PassengerCount>60.59</PassengerCount>
+ <TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
+ <Payload unit="kg">3519.61</Payload>
+ <PassengerCount>49.57</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.14041</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.17565</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1109.82</CO2>
+ <CO2 unit="g/km">1039.10</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
@@ -433,9 +433,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.91114</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.06324</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">873.11</CO2>
+ <CO2 unit="g/km">810.96</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
@@ -447,37 +447,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.33438</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.51205</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">904.14</CO2>
+ <CO2 unit="g/km">843.86</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
- <Payload unit="kg">1262.82</Payload>
- <PassengerCount>17.79</PassengerCount>
+ <TotalVehicleMass unit="kg">14452.35</TotalVehicleMass>
+ <Payload unit="kg">1052.35</Payload>
+ <PassengerCount>14.82</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.79159</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.14244</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1010.95</CO2>
+ <CO2 unit="g/km">963.37</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">18451.30</TotalVehicleMass>
- <Payload unit="kg">5051.30</Payload>
- <PassengerCount>71.15</PassengerCount>
+ <TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
+ <Payload unit="kg">4209.41</Payload>
+ <PassengerCount>59.29</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.77755</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.86026</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1156.53</CO2>
+ <CO2 unit="g/km">1089.29</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
@@ -489,9 +489,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.42999</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.54039</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">911.14</CO2>
+ <CO2 unit="g/km">845.93</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
@@ -503,24 +503,24 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.91402</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.07723</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">946.63</CO2>
+ <CO2 unit="g/km">885.29</CO2>
</Result>
</Results>
<ApplicationInformation>
<SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-05-11T12:53:35.5309828Z</Date>
+ <Date>2020-05-28T09:52:05.8747231Z</Date>
</ApplicationInformation>
</pif:Data>
<pif:Signature>
- <di:Reference URI="#PIF-031eec78fb1746d280d9">
+ <di:Reference URI="#PIF-35d2c92f368748528f58">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>abc/t5+cWFTVDs6Mg9DmP5sj7khuShNbWtU6Zxi9MGw=</di:DigestValue>
+ <di:DigestValue>7oGL3IjWrdZyNguz1VYabaxABpSO8GkKn5rAQ+SyUhA=</di:DigestValue>
</di:Reference>
</pif:Signature>
</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b/primary_heavyBus group_P31_32_Smart_ES.PIF_incl TC.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b/primary_heavyBus group_P31_32_Smart_ES.PIF_incl TC.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dd8e91637c540cb94f2acb0dc99a3e3edfd6302f
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b/primary_heavyBus group_P31_32_Smart_ES.PIF_incl TC.xml
@@ -0,0 +1,543 @@
+<?xml version="1.0" encoding="utf-8"?>
+<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-031eec78fb1746d280d9">
+ <Vehicle xsi:type="VehiclePIFType">
+ <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+ <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890_nonSmart</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <VehicleCategory>Bus</VehicleCategory>
+ <AxleConfiguration>4x2</AxleConfiguration>
+ <Articulated>false</Articulated>
+ <TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>700</IdlingSpeed>
+ <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
+ <adas:EngineStopStart>false</adas:EngineStopStart>
+ <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
+ <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
+ <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
+ <tcl:Entry gear="6" maxTorque="1800" />
+ <tcl:Entry gear="1" maxTorque="2500" />
+ </TorqueLimits>
+ <Components xsi:type="VehicleComponentsPIFType">
+ <Engine>
+ <Data xsi:type="EngineDataPIFType">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>Generic primary bus 41 Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>7700</Displacement>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>220000</RatedPower>
+ <MaxEngineTorque>1100</MaxEngineTorque>
+ <WHRType>
+ <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
+ <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+ </WHRType>
+ <Mode>
+ <IdlingSpeed>700</IdlingSpeed>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="600.00" maxTorque="546.02" dragTorque="-39.66" />
+ <Entry engineSpeed="800.00" maxTorque="760.78" dragTorque="-48.83" />
+ <Entry engineSpeed="1000.00" maxTorque="973.29" dragTorque="-56.44" />
+ <Entry engineSpeed="1200.00" maxTorque="1092.03" dragTorque="-67.29" />
+ <Entry engineSpeed="1400.00" maxTorque="1092.03" dragTorque="-77.58" />
+ <Entry engineSpeed="1600.00" maxTorque="1092.03" dragTorque="-87.88" />
+ <Entry engineSpeed="1800.00" maxTorque="1022.52" dragTorque="-94.11" />
+ <Entry engineSpeed="2000.00" maxTorque="944.17" dragTorque="-100.76" />
+ <Entry engineSpeed="2200.00" maxTorque="868.12" dragTorque="-113.36" />
+ <Entry engineSpeed="2400.00" maxTorque="741.99" dragTorque="-122.60" />
+ <Entry engineSpeed="2500.00" maxTorque="647.29" dragTorque="-126.66" />
+ <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-132.07" />
+ </FullLoadAndDragCurve>
+ <Fuels>
+ <FuelType>Diesel CI</FuelType>
+ </Fuels>
+ </Mode>
+ </Data>
+ </Engine>
+ <Transmission>
+ <Data xsi:type="TransmissionDataPIFType">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>AT 6 Gear</Model>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>APT-S</TransmissionType>
+ <Gears xsi:type="TransmissionGearsPIFType">
+ <Gear number="1">
+ <Ratio>3.364</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2500</MaxSpeed>
+ </Gear>
+ <Gear number="2">
+ <Ratio>1.909</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ <MaxSpeed>2500</MaxSpeed>
+ </Gear>
+ <Gear number="3">
+ <Ratio>1.421</Ratio>
+ <MaxSpeed>2500</MaxSpeed>
+ </Gear>
+ <Gear number="4">
+ <Ratio>1.000</Ratio>
+ <MaxSpeed>2500</MaxSpeed>
+ </Gear>
+ <Gear number="5">
+ <Ratio>0.720</Ratio>
+ <MaxSpeed>2500</MaxSpeed>
+ </Gear>
+ <Gear number="6">
+ <Ratio>0.615</Ratio>
+ <MaxSpeed>2500</MaxSpeed>
+ </Gear>
+ </Gears>
+ </Data>
+ </Transmission>
+ <TorqueConverter>
+ <Data xsi:type="TorqueConverterDataPIFType">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <Model>Some Model</Model>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>TC CalcApp 123</AppVersion>
+ <Characteristics>
+ <Entry speedRatio='0.0000' torqueRatio='1.80' inputTorqueRef='368.37'/>
+ <Entry speedRatio='0.6000' torqueRatio='1.23' inputTorqueRef='294.70'/>
+ <Entry speedRatio='0.9000' torqueRatio='0.95' inputTorqueRef='184.18'/>
+ <Entry speedRatio='1.0000' torqueRatio='0.94' inputTorqueRef='0.00'/>
+ <Entry speedRatio='5.0000' torqueRatio='0.90' inputTorqueRef='-1473.48'/>
+ </Characteristics>
+ </Data>
+ </TorqueConverter>
+ <Axlegear>
+ <Data xsi:type="AxlegearDataPIFType">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>Generic primary bus 41 AxleGear</Model>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>6.500</Ratio>
+ </Data>
+ </Axlegear>
+ <pbus:AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
+ <Data xsi:type="AxleWheelsDataDeclarationType">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </Data>
+ </pbus:AxleWheels>
+ <Auxiliaries>
+ <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
+ <aux:Fan>
+ <aux:Technology>Hydraulic driven - Constant displacement pump</aux:Technology>
+ </aux:Fan>
+ <aux:SteeringPump>
+ <aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
+ </aux:SteeringPump>
+ <aux:ElectricSystem>
+ <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
+ <aux:SmartElectrics>true</aux:SmartElectrics>
+ <aux:MaxAlternatorPower>15000</aux:MaxAlternatorPower>
+ <aux:ElectricStorageCapacity>50</aux:ElectricStorageCapacity>
+ </aux:ElectricSystem>
+ <aux:PneumaticSystem>
+ <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
+ <aux:Clutch>none</aux:Clutch>
+ <aux:CompressorRatio>1.000</aux:CompressorRatio>
+ <aux:SmartCompressionSystem>false</aux:SmartCompressionSystem>
+ <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
+ <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
+ <aux:AdBlueDosing>true</aux:AdBlueDosing>
+ </aux:PneumaticSystem>
+ <aux:HVAC>
+ <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
+ <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
+ </aux:HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </Vehicle>
+ <InputDataSignature>
+ <di:Reference URI="#VEH-PrimaryBus_nonSmart">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>qbkrFYROE5tA+8PnYHcW9bd65Z8HWn1fCwMHHrtSqKY=</di:DigestValue>
+ </di:Reference>
+ </InputDataSignature>
+ <ManufacturerRecordSignature>
+ <di:Reference URI="#RESULT-6c34e6e3c0654ca2b66d">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>5tgyq+cWmJLc6jGrNL+vrTKwUvPfffC9L2KQNsN5me0=</di:DigestValue>
+ </di:Reference>
+ </ManufacturerRecordSignature>
+ <Results>
+ <Status>success</Status>
+ <Result status="success">
+ <VehicleGroup>P31SD</VehicleGroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+ <Payload unit="kg">1123.63</Payload>
+ <PassengerCount>16.52</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">19.39581</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1421.75</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31SD</VehicleGroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+ <Payload unit="kg">5618.16</Payload>
+ <PassengerCount>82.62</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">23.48056</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1721.17</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31SD</VehicleGroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+ <Payload unit="kg">1123.63</Payload>
+ <PassengerCount>16.52</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">15.90915</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1166.17</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31SD</VehicleGroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+ <Payload unit="kg">5618.16</Payload>
+ <PassengerCount>82.62</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">19.25350</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1411.32</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31SD</VehicleGroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
+ <Payload unit="kg">1123.63</Payload>
+ <PassengerCount>16.52</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">14.61881</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1071.59</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31SD</VehicleGroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
+ <Payload unit="kg">5618.16</Payload>
+ <PassengerCount>82.62</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">17.74669</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1300.87</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31DD</VehicleGroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+ <Payload unit="kg">1193.34</Payload>
+ <PassengerCount>17.55</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">19.82851</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1453.47</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31DD</VehicleGroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+ <Payload unit="kg">5966.69</Payload>
+ <PassengerCount>87.75</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">24.12659</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1768.53</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31DD</VehicleGroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+ <Payload unit="kg">1193.34</Payload>
+ <PassengerCount>17.55</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">16.37265</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1200.15</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31DD</VehicleGroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+ <Payload unit="kg">5966.69</Payload>
+ <PassengerCount>87.75</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">19.89387</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1458.26</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31DD</VehicleGroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
+ <Payload unit="kg">1193.34</Payload>
+ <PassengerCount>17.55</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">15.18680</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1113.22</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P31DD</VehicleGroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
+ <Payload unit="kg">5966.69</Payload>
+ <PassengerCount>87.75</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">18.46135</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1353.26</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32SD</VehicleGroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
+ <Payload unit="kg">1075.44</Payload>
+ <PassengerCount>15.15</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">13.39119</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">981.60</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32SD</VehicleGroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">17451.75</TotalVehicleMass>
+ <Payload unit="kg">4301.75</Payload>
+ <PassengerCount>60.59</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">15.14041</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1109.82</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32SD</VehicleGroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
+ <Payload unit="kg">1094.99</Payload>
+ <PassengerCount>15.42</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">11.91114</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">873.11</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32SD</VehicleGroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
+ <Payload unit="kg">2737.48</Payload>
+ <PassengerCount>38.56</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">12.33438</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">904.14</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32DD</VehicleGroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
+ <Payload unit="kg">1262.82</Payload>
+ <PassengerCount>17.79</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">13.79159</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1010.95</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32DD</VehicleGroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">18451.30</TotalVehicleMass>
+ <Payload unit="kg">5051.30</Payload>
+ <PassengerCount>71.15</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">15.77755</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1156.53</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32DD</VehicleGroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
+ <Payload unit="kg">1347.01</Payload>
+ <PassengerCount>18.97</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">12.42999</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">911.14</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P32DD</VehicleGroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
+ <Payload unit="kg">3367.53</Payload>
+ <PassengerCount>47.43</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">12.91402</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">946.63</CO2>
+ </Result>
+ </Results>
+ <ApplicationInformation>
+ <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2020-05-11T12:53:35.5309828Z</Date>
+ </ApplicationInformation>
+ </pif:Data>
+ <pif:Signature>
+ <di:Reference URI="#PIF-031eec78fb1746d280d9">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>abc/t5+cWFTVDs6Mg9DmP5sj7khuShNbWtU6Zxi9MGw=</di:DigestValue>
+ </di:Reference>
+ </pif:Signature>
+</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/Completed 31b/vecto_vehicle-completed_heavyBus_31b.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b/vecto_vehicle-completed_heavyBus_31b.xml
similarity index 100%
rename from Generic Vehicles/Declaration Mode/Completed 31b/vecto_vehicle-completed_heavyBus_31b.xml
rename to Generic Vehicles/Declaration Mode/CompletedBus 31b/vecto_vehicle-completed_heavyBus_31b.xml
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml b/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml
index e3297b102fa69f17d84177abea8af770d2093aff..36f07e888c0d4ee87db0041aa278fc5bddd965e2 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
- <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-a05132b257084f40aaea">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-c8b453c485434c64944f">
<Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
+ <ManufacturerPrimaryVehicle>Generic Bus Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_SmartPS</VIN>
@@ -261,17 +261,17 @@
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>0BZN5PRA+yNbRtyLAPI/77M0iruHuhaFcTOZnPxKfHU=</di:DigestValue>
+ <di:DigestValue>uqcFIXtDYxvl513ruiYYJCrV1fIiyw37t8vJhg4xxoo=</di:DigestValue>
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-3a8e8386f57c42c1a157">
+ <di:Reference URI="#RESULT-82b4f146b0aa4bbd999e">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>sLB3B7Y2jzBFA1PR6n/xV+rsz77UGsbY23o0IGGX2Ng=</di:DigestValue>
+ <di:DigestValue>Gl4zU+e+6MHw1VEoATFgmxfzrPRIBZ0ENDYcsgKLYtQ=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -286,9 +286,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.09062</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1619.29</CO2>
+ <CO2 unit="g/km">1555.73</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -300,9 +300,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">26.42283</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1936.85</CO2>
+ <CO2 unit="g/km">1862.57</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -314,9 +314,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.40227</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1275.62</CO2>
+ <CO2 unit="g/km">1227.15</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -328,9 +328,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">21.00254</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1539.53</CO2>
+ <CO2 unit="g/km">1483.80</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -342,9 +342,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.97840</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1097.95</CO2>
+ <CO2 unit="g/km">1051.58</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -356,9 +356,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">18.29954</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1341.39</CO2>
+ <CO2 unit="g/km">1290.13</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -370,9 +370,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.84600</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1674.66</CO2>
+ <CO2 unit="g/km">1665.49</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -384,9 +384,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">27.81260</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">2038.72</CO2>
+ <CO2 unit="g/km">2049.48</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -398,9 +398,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">18.08030</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1325.32</CO2>
+ <CO2 unit="g/km">1312.66</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -412,9 +412,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.18081</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1625.90</CO2>
+ <CO2 unit="g/km">1630.09</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -426,9 +426,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.62208</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1145.13</CO2>
+ <CO2 unit="g/km">1120.08</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -440,37 +440,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.48708</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1428.44</CO2>
+ <CO2 unit="g/km">1411.95</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
- <Payload unit="kg">1254.68</Payload>
- <PassengerCount>17.67</PassengerCount>
+ <TotalVehicleMass unit="kg">16239.55</TotalVehicleMass>
+ <Payload unit="kg">1026.55</Payload>
+ <PassengerCount>14.46</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.55465</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.82464</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">920.28</CO2>
+ <CO2 unit="g/km">866.77</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">20231.71</TotalVehicleMass>
- <Payload unit="kg">5018.71</Payload>
- <PassengerCount>70.69</PassengerCount>
+ <TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
+ <Payload unit="kg">4106.21</Payload>
+ <PassengerCount>57.83</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.40400</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1055.84</CO2>
+ <CO2 unit="g/km">976.63</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
@@ -482,9 +482,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">9.47946</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">694.86</CO2>
+ <CO2 unit="g/km">639.08</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
@@ -496,37 +496,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">9.96360</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">730.35</CO2>
+ <CO2 unit="g/km">674.57</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
- <Payload unit="kg">1738.08</Payload>
- <PassengerCount>24.48</PassengerCount>
+ <TotalVehicleMass unit="kg">19298.40</TotalVehicleMass>
+ <Payload unit="kg">1448.40</Payload>
+ <PassengerCount>20.40</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.19300</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.44807</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1040.38</CO2>
+ <CO2 unit="g/km">985.77</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">24802.32</TotalVehicleMass>
- <Payload unit="kg">6952.32</Payload>
- <PassengerCount>97.92</PassengerCount>
+ <TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
+ <Payload unit="kg">5793.60</Payload>
+ <PassengerCount>81.60</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.70781</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1224.72</CO2>
+ <CO2 unit="g/km">1141.12</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
@@ -538,9 +538,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">10.63725</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">779.73</CO2>
+ <CO2 unit="g/km">720.51</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
@@ -552,24 +552,24 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.34633</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">831.71</CO2>
+ <CO2 unit="g/km">774.60</CO2>
</Result>
</Results>
<ApplicationInformation>
- <SimulationToolVersion>0.6.1.1954-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-05-11T09:15:28.1347345Z</Date>
+ <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2020-05-28T09:51:39.6478812Z</Date>
</ApplicationInformation>
</pif:Data>
<pif:Signature>
- <di:Reference URI="#PIF-a05132b257084f40aaea">
+ <di:Reference URI="#PIF-c8b453c485434c64944f">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>6Mg8/kouOaJSejUIYlsWCjr183cZAHK9iaFbNbG9q9U=</di:DigestValue>
+ <di:DigestValue>5KVo8ALppPSbjnRc9INOVP7076vOZW9YCt91Oov8/+U=</di:DigestValue>
</di:Reference>
</pif:Signature>
</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/CompletedBus_39a.vecto b/Generic Vehicles/Declaration Mode/CompletedBus 39a/CompletedBus_39a.vecto
new file mode 100644
index 0000000000000000000000000000000000000000..15aa214b0055d2b517ecb46394bc5810ac988fd5
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/CompletedBus_39a.vecto
@@ -0,0 +1,12 @@
+{
+ "Header": {
+ "CreatedBy": "Markus Quaritsch, IVT, Graz University of Technology",
+ "Date": "2020-02-07T15:06:30.9725917Z",
+ "AppVersion": "2.2",
+ "FileVersion": 7
+ },
+ "Body": {
+ "CompletedVehicle": "vecto_vehicle-completed_heavyBus_39a.xml",
+ "PrimaryVehicleResults": "primary_heavyBus group P39_40_nonSmart_ESS_PIF.xml"
+ }
+}
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_PIF.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_PIF.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ee0f566dfddcdde351ec5c2023c53de3b7a428a7
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/primary_heavyBus group P39_40_nonSmart_ESS_PIF.xml
@@ -0,0 +1,575 @@
+<?xml version="1.0" encoding="utf-8"?>
+<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-10652bf49ae0499f8689">
+ <Vehicle xsi:type="VehiclePIFType">
+ <ManufacturerPrimaryVehicle>Generic Bus Manufacturer</ManufacturerPrimaryVehicle>
+ <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Model>Generic Model</Model>
+ <VIN>VEH-1234567890_nonSmart-ESS</VIN>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <VehicleCategory>Bus</VehicleCategory>
+ <AxleConfiguration>8x2</AxleConfiguration>
+ <Articulated>true</Articulated>
+ <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
+ <IdlingSpeed>600</IdlingSpeed>
+ <RetarderType>Transmission Output Retarder</RetarderType>
+ <RetarderRatio>1.000</RetarderRatio>
+ <AngledriveType>None</AngledriveType>
+ <ZeroEmissionVehicle>false</ZeroEmissionVehicle>
+ <ADAS xmlns:adas="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xsi:type="adas:AdvancedDriverAssistantSystemsType">
+ <adas:EngineStopStart>true</adas:EngineStopStart>
+ <adas:EcoRollWithoutEngineStop>false</adas:EcoRollWithoutEngineStop>
+ <adas:EcoRollWithEngineStop>false</adas:EcoRollWithEngineStop>
+ <adas:PredictiveCruiseControl>none</adas:PredictiveCruiseControl>
+ </ADAS>
+ <TorqueLimits xmlns:tcl="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="tcl:TorqueLimitsType">
+ <tcl:Entry gear="6" maxTorque="1800" />
+ <tcl:Entry gear="1" maxTorque="2500" />
+ <tcl:Entry gear="12" maxTorque="1900" />
+ </TorqueLimits>
+ <Components xsi:type="VehicleComponentsPIFType">
+ <Engine>
+ <Data xsi:type="EngineDataPIFType">
+ <Manufacturer>Generic Engine Manufacturer</Manufacturer>
+ <Model>8x2 articulated bus Engine</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-02-15T11:00:00Z</Date>
+ <AppVersion>VectoEngine x.y</AppVersion>
+ <Displacement>12730</Displacement>
+ <RatedSpeed>2200</RatedSpeed>
+ <RatedPower>260</RatedPower>
+ <MaxEngineTorque>2400</MaxEngineTorque>
+ <WHRType>
+ <MechanicalOutputICE xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputICE>
+ <MechanicalOutputDrivetrain xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</MechanicalOutputDrivetrain>
+ <ElectricalOutput xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3">false</ElectricalOutput>
+ </WHRType>
+ <Mode>
+ <IdlingSpeed>600</IdlingSpeed>
+ <FullLoadAndDragCurve>
+ <Entry engineSpeed="600.00" maxTorque="710.00" dragTorque="-52.00" />
+ <Entry engineSpeed="800.00" maxTorque="989.00" dragTorque="-63.00" />
+ <Entry engineSpeed="1000.00" maxTorque="1265.00" dragTorque="-73.00" />
+ <Entry engineSpeed="1200.00" maxTorque="1420.00" dragTorque="-87.00" />
+ <Entry engineSpeed="1400.00" maxTorque="1420.00" dragTorque="-101.00" />
+ <Entry engineSpeed="1600.00" maxTorque="1420.00" dragTorque="-114.00" />
+ <Entry engineSpeed="1800.00" maxTorque="1329.00" dragTorque="-122.00" />
+ <Entry engineSpeed="2000.00" maxTorque="1227.00" dragTorque="-131.00" />
+ <Entry engineSpeed="2200.00" maxTorque="1129.00" dragTorque="-147.00" />
+ <Entry engineSpeed="2400.00" maxTorque="965.00" dragTorque="-159.00" />
+ <Entry engineSpeed="2500.00" maxTorque="841.00" dragTorque="-165.00" />
+ <Entry engineSpeed="2600.00" maxTorque="0.00" dragTorque="-172.00" />
+ </FullLoadAndDragCurve>
+ <Fuels>
+ <FuelType>Diesel CI</FuelType>
+ </Fuels>
+ </Mode>
+ </Data>
+ </Engine>
+ <Transmission>
+ <Data xsi:type="TransmissionDataPIFType">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>8x2 Bus</Model>
+ <MainCertificationMethod>Standard values</MainCertificationMethod>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <TransmissionType>APT-P</TransmissionType>
+ <Gears xsi:type="TransmissionGearsPIFType">
+ <Gear number="1">
+ <Ratio>1.361</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ </Gear>
+ <Gear number="2">
+ <Ratio>1.000</Ratio>
+ <MaxTorque>1900</MaxTorque>
+ </Gear>
+ <Gear number="3">
+ <Ratio>0.735</Ratio>
+ </Gear>
+ </Gears>
+ </Data>
+ </Transmission>
+ <Axlegear>
+ <Data xsi:type="AxlegearDataPIFType">
+ <Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
+ <Model>8x2 articulated bus</Model>
+ <CertificationMethod>Standard values</CertificationMethod>
+ <Date>2017-01-11T11:00:00Z</Date>
+ <AppVersion>3.0.1</AppVersion>
+ <LineType>Single portal axle</LineType>
+ <Ratio>5.810</Ratio>
+ </Data>
+ </Axlegear>
+ <pbus:AxleWheels xmlns:pbus="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="AxleWheelsComponentDeclarationType">
+ <Data xsi:type="AxleWheelsDataDeclarationType">
+ <Axles>
+ <Axle axleNumber="1" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>true</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="2" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="3" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleDriven</AxleType>
+ <TwinTyres>true</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0063</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>KljvtvGUUQ/L7MiLVAqU+bckL5PNDNNwdeLH9kUVrfM=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ <Axle axleNumber="4" xsi:type="AxleDataDeclarationType">
+ <AxleType>VehicleNonDriven</AxleType>
+ <TwinTyres>false</TwinTyres>
+ <Steered>false</Steered>
+ <Tyre>
+ <Data id="WHL-5432198760-315-70-R22.5" xsi:type="TyreDataDeclarationType">
+ <Manufacturer>Generic Wheels Manufacturer</Manufacturer>
+ <Model>Generic Wheel</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-01-11T14:00:00Z</Date>
+ <AppVersion>Tyre Generation App 1.0</AppVersion>
+ <Dimension>315/70 R22.5</Dimension>
+ <RRCDeclared>0.0055</RRCDeclared>
+ <FzISO>31300</FzISO>
+ </Data>
+ <Signature>
+ <di:Reference URI="#WHL-5432198760-315-70-R22.5" xmlns:di="http://www.w3.org/2000/09/xmldsig#">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>4TkUGQTX8tevHOU9Cj9uyCFuI/aqcEYlo/gyVjVQmv0=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </Tyre>
+ </Axle>
+ </Axles>
+ </Data>
+ </pbus:AxleWheels>
+ <Auxiliaries>
+ <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="aux:PrimaryVehicleAuxiliaryDataDeclarationType">
+ <aux:Fan>
+ <aux:Technology>Hydraulic driven - Constant displacement pump</aux:Technology>
+ </aux:Fan>
+ <aux:SteeringPump>
+ <aux:Technology axleNumber="1">Variable displacement elec. controlled</aux:Technology>
+ </aux:SteeringPump>
+ <aux:ElectricSystem>
+ <aux:AlternatorTechnology>default</aux:AlternatorTechnology>
+ <aux:SmartElectrics>false</aux:SmartElectrics>
+ </aux:ElectricSystem>
+ <aux:PneumaticSystem>
+ <aux:SizeOfAirSupply>Large Supply 2-stage</aux:SizeOfAirSupply>
+ <aux:Clutch>none</aux:Clutch>
+ <aux:CompressorRatio>1.000</aux:CompressorRatio>
+ <aux:SmartCompressionSystem>false</aux:SmartCompressionSystem>
+ <aux:SmartRegenerationSystem>false</aux:SmartRegenerationSystem>
+ <aux:AirsuspensionControl>electronically</aux:AirsuspensionControl>
+ <aux:AdBlueDosing>true</aux:AdBlueDosing>
+ </aux:PneumaticSystem>
+ <aux:HVAC>
+ <aux:AdjustableCoolantThermostat>true</aux:AdjustableCoolantThermostat>
+ <aux:EngineWasteGasHeatExchanger>true</aux:EngineWasteGasHeatExchanger>
+ </aux:HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </Vehicle>
+ <InputDataSignature>
+ <di:Reference URI="#VEH-PrimaryBus_nonSmart-ESS">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>jvHzwuW7gaqCxNBELjVg0ZwSEWPR+pSn2iUsocSa2/4=</di:DigestValue>
+ </di:Reference>
+ </InputDataSignature>
+ <ManufacturerRecordSignature>
+ <di:Reference URI="#RESULT-65d622ab1d834d94ac65">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>k2hbOlnDmFKemd1pQt7YrzNLf5RAKIdH7wMobex4+hw=</di:DigestValue>
+ </di:Reference>
+ </ManufacturerRecordSignature>
+ <Results>
+ <Status>error</Status>
+ <Result status="success">
+ <VehicleGroup>P39SD</VehicleGroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
+ <Payload unit="kg">2059.99</Payload>
+ <PassengerCount>30.29</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">31.43467</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">2304.23</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P39SD</VehicleGroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
+ <Payload unit="kg">10299.96</Payload>
+ <PassengerCount>151.47</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">40.44322</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">2964.57</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P39SD</VehicleGroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
+ <Payload unit="kg">2059.99</Payload>
+ <PassengerCount>30.29</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">25.29407</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1854.11</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P39SD</VehicleGroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
+ <Payload unit="kg">10299.96</Payload>
+ <PassengerCount>151.47</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">32.82324</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">2406.01</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P39SD</VehicleGroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">21659.99</TotalVehicleMass>
+ <Payload unit="kg">2059.99</Payload>
+ <PassengerCount>30.29</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">21.42260</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1570.32</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P39SD</VehicleGroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">29899.96</TotalVehicleMass>
+ <Payload unit="kg">10299.96</Payload>
+ <PassengerCount>151.47</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">26.89680</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1971.59</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P39DD</VehicleGroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
+ <Payload unit="kg">2540.66</Payload>
+ <PassengerCount>37.36</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">38.59941</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">2829.42</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P39DD</VehicleGroup>
+ <Mission>Heavy Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
+ <Payload unit="kg">12703.28</Payload>
+ <PassengerCount>186.81</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">50.04116</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">3668.12</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P39DD</VehicleGroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
+ <Payload unit="kg">2540.66</Payload>
+ <PassengerCount>37.36</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">31.08581</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">2278.66</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P39DD</VehicleGroup>
+ <Mission>Urban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
+ <Payload unit="kg">12703.28</Payload>
+ <PassengerCount>186.81</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">41.40670</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">3035.20</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P39DD</VehicleGroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">27340.66</TotalVehicleMass>
+ <Payload unit="kg">2540.66</Payload>
+ <PassengerCount>37.36</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">25.67399</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1881.96</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P39DD</VehicleGroup>
+ <Mission>Suburban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">37503.28</TotalVehicleMass>
+ <Payload unit="kg">12703.28</Payload>
+ <PassengerCount>186.81</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">32.19445</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">2359.92</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P40SD</VehicleGroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">22563.16</TotalVehicleMass>
+ <Payload unit="kg">1613.16</Payload>
+ <PassengerCount>22.72</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">18.51694</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1357.33</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P40SD</VehicleGroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">27402.62</TotalVehicleMass>
+ <Payload unit="kg">6452.62</Payload>
+ <PassengerCount>90.88</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">38.15886</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">2797.12</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P40SD</VehicleGroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">22957.48</TotalVehicleMass>
+ <Payload unit="kg">2007.48</Payload>
+ <PassengerCount>28.27</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">13.84130</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1014.60</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P40SD</VehicleGroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">25968.71</TotalVehicleMass>
+ <Payload unit="kg">5018.71</Payload>
+ <PassengerCount>70.69</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">15.06873</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1104.57</CO2>
+ </Result>
+ <Result status="success">
+ <VehicleGroup>P40DD</VehicleGroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">26840.49</TotalVehicleMass>
+ <Payload unit="kg">2240.49</Payload>
+ <PassengerCount>31.56</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">22.11304</EnergyConsumption>
+ </Fuel>
+ <CO2 unit="g/km">1620.93</CO2>
+ </Result>
+ <Result status="error">
+ <VehicleGroup>P40DD</VehicleGroup>
+ <Mission>Interurban</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">33561.98</TotalVehicleMass>
+ <Payload unit="kg">8961.98</Payload>
+ <PassengerCount>126.23</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Error>98 (Interurban _P40DD_ReferenceLoad) - absTime: 6784.9522 [s], distance: 53835.3412 [m], dt: 0.6791 [s], v: 0.0259 [m/s], Gear: 1 | DrivingActionAccelerate: Failed to find operating point</Error>
+ <ErrorDetails> bei TUGraz.VectoCore.Models.SimulationComponent.Impl.Driver.DrivingActionAccelerate(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient, IResponse previousResponse)
+ bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DriverModeDrive.FirstAccelerateOrCoast(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient, Boolean prohibitOverspeed, MeterPerSecond velocityWithOverspeed, DebugData debug)
+ bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DriverModeDrive.HandleRequestEngaged(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient, Boolean prohibitOverspeed, MeterPerSecond velocityWithOverspeed, DebugData debug)
+ bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DriverModeDrive.DoHandleRequest(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient, Boolean prohibitOverspeed)
+ bei TUGraz.VectoCore.Models.SimulationComponent.Impl.AbstractDriverMode.Request(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient)
+ bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DefaultDriverStrategy.DoHandleRequest(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient)
+ bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DefaultDriverStrategy.Request(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient)
+ bei TUGraz.VectoCore.Models.SimulationComponent.Impl.Driver.Request(Second absTime, Meter ds, MeterPerSecond targetVelocity, Radian gradient)
+ bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DistanceBasedDrivingCycle.DriveDistance(Second absTime, Meter ds)
+ bei TUGraz.VectoCore.Models.SimulationComponent.Impl.DistanceBasedDrivingCycle.Request(Second absTime, Meter ds)
+ bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.DoSimulationStep()
+ bei TUGraz.VectoCore.Models.Simulation.Impl.VectoRun.Run()</ErrorDetails>
+ </Result>
+ <Result status="error">
+ <VehicleGroup>P40DD</VehicleGroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">27467.83</TotalVehicleMass>
+ <Payload unit="kg">2867.83</Payload>
+ <PassengerCount>40.39</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Error>99 (Coach _P40DD_LowLoading) - absTime: 7924.2025 [s], distance: 131329.1916 [m], dt: 0.6490 [s], v: 0.0076 [m/s], Gear: 1 | DistanceRun got an unexpected response: ResponseOverload{Delta: 228.7985 [W], Source: TUGraz.VectoCore.Models.SimulationComponent.Impl.TorqueConverter, AbsTime: , SimulationInterval: 0.0036 [s], SimulationDistance: 0.0000 [m], Acceleration: -0.0306 [m/s^2], OperatingPoint: a: -0.0306 [m/s^2], dt: 0.0036 [s], ds: 0.0000 [m], EngineSpeed: , EnginePowerRequest: , DynamicFullLoadPower: , DragPower: , EngineTorqueDemand: , EngineTorqueDemandTotal: , EngineStationaryFullLoadTorque: , EngineDynamicFullLoadTorque: , VehicleSpeed: 0.0075 [m/s], AngledrivePowerRequest: , ClutchPowerRequest: , GearboxPowerRequest: 292.2862 [W], AxlegearPowerRequest: 283.3102 [W], WheelsPowerRequest: 283.3102 [W], BrakePower: 0.0000 [W], AuxiliariesPowerDemand: , CardanTorque: 3252.6557 [Nm], GearboxInputSpeed: 0.0889 [1/s], TorqueConverterOperatingPoint: n_out: 0.0902 [1/s], n_in: 63.4602 [1/s], tq_out: 726.9261 [Nm], tq_in 297.1152 [Nm], nu: 0.00142183442517666, my: 2.44661391211967, TorqueConverterTorqueDemand: }</Error>
+ <ErrorDetails> bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.<>c.<DoSimulationStep>b__1_3(IResponse r)
+ bei TUGraz.VectoCore.Utils.Switch`1.Default(Action`1 action)
+ bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.DoSimulationStep()
+ bei TUGraz.VectoCore.Models.Simulation.Impl.VectoRun.Run()</ErrorDetails>
+ </Result>
+ <Result status="error">
+ <VehicleGroup>P40DD</VehicleGroup>
+ <Mission>Coach</Mission>
+ <SimulationParameters>
+ <TotalVehicleMass unit="kg">31769.58</TotalVehicleMass>
+ <Payload unit="kg">7169.58</Payload>
+ <PassengerCount>100.98</PassengerCount>
+ <FuelMode>single fuel mode</FuelMode>
+ </SimulationParameters>
+ <Error>100 (Coach _P40DD_ReferenceLoad) - absTime: 7524.6514 [s], distance: 130336.7109 [m], dt: 0.7342 [s], v: 0.0092 [m/s], Gear: 1 | DistanceRun got an unexpected response: ResponseOverload{Delta: 270.7480 [W], Source: TUGraz.VectoCore.Models.SimulationComponent.Impl.TorqueConverter, AbsTime: , SimulationInterval: 0.0049 [s], SimulationDistance: 0.0000 [m], Acceleration: -0.0467 [m/s^2], OperatingPoint: a: -0.0467 [m/s^2], dt: 0.0049 [s], ds: 0.0000 [m], EngineSpeed: , EnginePowerRequest: , DynamicFullLoadPower: , DragPower: , EngineTorqueDemand: , EngineTorqueDemandTotal: , EngineStationaryFullLoadTorque: , EngineDynamicFullLoadTorque: , VehicleSpeed: 0.0090 [m/s], AngledrivePowerRequest: , ClutchPowerRequest: , GearboxPowerRequest: 345.1743 [W], AxlegearPowerRequest: 334.5284 [W], WheelsPowerRequest: 334.5284 [W], BrakePower: 0.0000 [W], AuxiliariesPowerDemand: , CardanTorque: 3212.7746 [Nm], GearboxInputSpeed: 0.1057 [1/s], TorqueConverterOperatingPoint: n_out: 0.1085 [1/s], n_in: 63.4602 [1/s], tq_out: 726.6280 [Nm], tq_in 297.0764 [Nm], nu: 0.00170920399100873, my: 2.44592954368211, TorqueConverterTorqueDemand: }</Error>
+ <ErrorDetails> bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.<>c.<DoSimulationStep>b__1_3(IResponse r)
+ bei TUGraz.VectoCore.Utils.Switch`1.Default(Action`1 action)
+ bei TUGraz.VectoCore.Models.Simulation.Impl.DistanceRun.DoSimulationStep()
+ bei TUGraz.VectoCore.Models.Simulation.Impl.VectoRun.Run()</ErrorDetails>
+ </Result>
+ </Results>
+ <ApplicationInformation>
+ <SimulationToolVersion>0.6.1.1974-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2020-05-28T14:48:47.62548Z</Date>
+ </ApplicationInformation>
+ </pif:Data>
+ <pif:Signature>
+ <di:Reference URI="#PIF-10652bf49ae0499f8689">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+ <di:DigestValue>kNMmLf/SQo7//Wr3wmU1/x7c3q7VbmBEILJi39cdrz4=</di:DigestValue>
+ </di:Reference>
+ </pif:Signature>
+</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a616f10f32be31a39960290950788f60d35399bc
--- /dev/null
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
+ <v2.0:Vehicle id="VEH-1234567890" xsi:type="CompletedVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
+ <Manufacturer>Some Manufacturer</Manufacturer>
+ <ManufacturerAddress>Infinite Loop 1</ManufacturerAddress>
+ <Model>Sample Bus Model</Model>
+ <VIN>VEH-1234567890</VIN>
+ <Date>2020-01-09T11:00:00Z</Date>
+ <LegislativeClass>M3</LegislativeClass>
+ <RegisteredClass>II</RegisteredClass>
+ <VehicleCode>CG</VehicleCode>
+ <CurbMassChassis>19000</CurbMassChassis>
+ <TechnicalPermissibleMaximumLadenMass>37000</TechnicalPermissibleMaximumLadenMass>
+ <RegisteredPassengers>
+ <LowerDeck>181</LowerDeck>
+ <UpperDeck>0</UpperDeck>
+ </RegisteredPassengers>
+ <LowEntry>false</LowEntry>
+ <HeightIntegratedBody>3.000</HeightIntegratedBody>
+ <VehicleLength>19.700</VehicleLength>
+ <VehicleWidth>2.550</VehicleWidth>
+ <EntranceHeight>0.320</EntranceHeight>
+ <DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+ <Components xsi:type="CompletedVehicleComponentsDeclarationType">
+ <v2.6:AirDrag xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
+ <Data id="CabinX23h" xsi:type="AirDragDataDeclarationType">
+ <Manufacturer>Generic Manufacturer</Manufacturer>
+ <Model>Generic Model</Model>
+ <CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
+ <Date>2017-03-24T15:00:00Z</Date>
+ <AppVersion>Vecto AirDrag x.y</AppVersion>
+ <CdxA_0>5.20</CdxA_0>
+ <TransferredCdxA>5.20</TransferredCdxA>
+ <DeclaredCdxA>5.20</DeclaredCdxA>
+ </Data>
+ <Signature>
+ <di:Reference URI="#CabinX23h">
+ <di:Transforms>
+ <di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+ <di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+ </di:Transforms>
+ <di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+ <di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+ </di:Reference>
+ </Signature>
+ </v2.6:AirDrag>
+ <Auxiliaries>
+ <Data xsi:type="CompletedVehicleAuxiliaryDataDeclarationType">
+ <ElectricSystem>
+ <AlternatorTechnology>default</AlternatorTechnology>
+ <LEDLights>
+ <Dayrunninglights>true</Dayrunninglights>
+ <Headlights>true</Headlights>
+ <Positionlights>true</Positionlights>
+ <Brakelights>true</Brakelights>
+ <Interiorlights>true</Interiorlights>
+ </LEDLights>
+ </ElectricSystem>
+ <HVAC>
+ <SystemConfiguration>7</SystemConfiguration>
+ <CompressorType>
+ <DriverAC>2-stage</DriverAC>
+ <PassengerAC>3-stage</PassengerAC>
+ </CompressorType>
+ <AuxiliaryHeaterPower>15000</AuxiliaryHeaterPower>
+ <DoubleGlasing>true</DoubleGlasing>
+ <HeatPump>false</HeatPump>
+ <AdjustableAuxiliaryHeater>false</AdjustableAuxiliaryHeater>
+ <SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+ </HVAC>
+ </Data>
+ </Auxiliaries>
+ </Components>
+ </v2.0:Vehicle>
+</tns:VectoInputDeclaration>
diff --git a/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml b/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml
index 250df1d708987ef7194f42f83bb571fd78fb78b9..4e56fa439d824afbab1420a76282eb8e394dd4fc 100644
--- a/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml
+++ b/Generic Vehicles/Declaration Mode/Group P31_32/primary_heavyBus group_P31_32_Smart_ES.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
- <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <Manufacturer>Generic Bus Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
@@ -36,7 +36,7 @@
<Displacement>7700</Displacement>
<IdlingSpeed>700</IdlingSpeed>
<RatedSpeed>2200</RatedSpeed>
- <RatedPower>220000</RatedPower>
+ <RatedPower>200000</RatedPower>
<MaxEngineTorque>1100</MaxEngineTorque>
<WHTCUrban>1.0600</WHTCUrban>
<WHTCRural>1.0300</WHTCRural>
diff --git a/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml b/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml
index 48caa0c3f0b498cfe7ca0fdd285bdedfae5890db..4d065f7c2d49d37856d8e87f14f1faa9c9a5f81b 100644
--- a/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml
+++ b/Generic Vehicles/Declaration Mode/Group P33_34/primary_heavyBus group_P33_34_SmartPS.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_SmartPS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
- <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <Manufacturer>Generic Bus Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_SmartPS</VIN>
diff --git a/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml b/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml
index 1f2160e1ceb5da198a6ab7e74a614ca3c23e3d16..f9ae42448f9612b7efa234ff72e0543182ecbcc8 100644
--- a/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml
+++ b/Generic Vehicles/Declaration Mode/Group P35_36/primary_heavyBus group_P35_36_nonSmart.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
- <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <Manufacturer>Generic Bus Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
diff --git a/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml b/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml
index b48df7b2d7d812ac35290537a7d0376c8a111281..30df4a340641a8a3e2b1455d862a59145a92f515 100644
--- a/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml
+++ b/Generic Vehicles/Declaration Mode/Group P37_38/primary_heavyBus group_P37_38_SmartES_PS.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_SmartES-PS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
- <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <Manufacturer>Generic Bus Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_SmartES-PS</VIN>
diff --git a/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml b/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml
index 2d12f98a4d38eddccc1efdeae3af731d13568ca0..0880ce6fec483131bf0470b4449f02bba59ce2cf 100644
--- a/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml
+++ b/Generic Vehicles/Declaration Mode/Group P39_40/primary_heavyBus group P39_40_nonSmart_ESS.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" xmlns:v2.6="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart-ESS" xsi:type="PrimaryVehicleDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6">
- <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <Manufacturer>Generic Bus Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart-ESS</VIN>
@@ -233,7 +233,6 @@
<Gear number="1">
<Ratio>1.361</Ratio>
<MaxTorque>1900</MaxTorque>
- <MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed='600.00' inputTorque='0.00' torqueLoss='48.00'/>
<Entry inputSpeed='600.00' inputTorque='200.00' torqueLoss='56.00'/>
@@ -366,7 +365,6 @@
<Gear number="2">
<Ratio>1.000</Ratio>
<MaxTorque>1900</MaxTorque>
- <MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed='600.00' inputTorque='0.00' torqueLoss='48.00'/>
<Entry inputSpeed='600.00' inputTorque='200.00' torqueLoss='50.00'/>
@@ -498,7 +496,6 @@
</Gear>
<Gear number="3">
<Ratio>0.735</Ratio>
- <MaxSpeed>2000</MaxSpeed>
<TorqueLossMap>
<Entry inputSpeed='600.00' inputTorque='0.00' torqueLoss='48.00'/>
<Entry inputSpeed='600.00' inputTorque='200.00' torqueLoss='56.00'/>
diff --git a/Generic Vehicles/Declaration Mode/VTP HeavyBus/VTP simulation.vecto b/Generic Vehicles/Declaration Mode/VTP HeavyBus/VTP simulation.vecto
index ccf5c278f4ea64c3f2fe60ad24eccfab3f9c0e0c..d6e9fbdf89832b152c31f1db5f66db735d2e1836 100644
--- a/Generic Vehicles/Declaration Mode/VTP HeavyBus/VTP simulation.vecto
+++ b/Generic Vehicles/Declaration Mode/VTP HeavyBus/VTP simulation.vecto
@@ -1,7 +1,7 @@
{
"Header": {
"CreatedBy": "",
- "Date": "2020-05-08T07:44:00.0849113Z",
+ "Date": "2020-05-27T12:05:01.1639053Z",
"AppVersion": "3",
"FileVersion": 4
},
@@ -13,7 +13,8 @@
"FanPowerCoefficients": [
7.32,
1200.0,
- 810.0
+ 810.0,
+ 1.0
],
"FanDiameter": 0.5,
"Cycles": [
diff --git a/VECTO/GUI/MainForm.Designer.vb b/VECTO/GUI/MainForm.Designer.vb
index c4b227b659b97ee98c3a6cdf772e661ea0bea28a..cc3bc14dc0f712caecd0c8294b601cfa70dce78b 100644
--- a/VECTO/GUI/MainForm.Designer.vb
+++ b/VECTO/GUI/MainForm.Designer.vb
@@ -59,10 +59,17 @@ Partial Class MainForm
Me.ButtonGENadd = New System.Windows.Forms.Button()
Me.TabPgOptions = New System.Windows.Forms.TabPage()
Me.PanelOptAllg = New System.Windows.Forms.Panel()
+ Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.tbMinSpeedLAC = New System.Windows.Forms.TextBox()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.Label2 = New System.Windows.Forms.Label()
Me.GroupBox4 = New System.Windows.Forms.GroupBox()
Me.BtTCfileBrowse = New System.Windows.Forms.Button()
Me.tbOutputFolder = New System.Windows.Forms.TextBox()
Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+ Me.cbSaveVectoRunData = New System.Windows.Forms.CheckBox()
Me.cbActVmod = New System.Windows.Forms.CheckBox()
Me.cbValidateRunData = New System.Windows.Forms.CheckBox()
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
@@ -119,13 +126,13 @@ Partial Class MainForm
Me.OpenInGraphWindowToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ShowInFolderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
- Me.cbSaveVectoRunData = New System.Windows.Forms.CheckBox()
Me.StatusBAR.SuspendLayout
Me.TabControl1.SuspendLayout
Me.TabPageGEN.SuspendLayout
CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).BeginInit
Me.TabPgOptions.SuspendLayout
Me.PanelOptAllg.SuspendLayout
+ Me.GroupBox5.SuspendLayout
Me.GroupBox4.SuspendLayout
Me.GroupBox3.SuspendLayout
Me.GroupBox2.SuspendLayout
@@ -380,6 +387,7 @@ Partial Class MainForm
'
'PanelOptAllg
'
+ Me.PanelOptAllg.Controls.Add(Me.GroupBox5)
Me.PanelOptAllg.Controls.Add(Me.GroupBox4)
Me.PanelOptAllg.Controls.Add(Me.GroupBox3)
Me.PanelOptAllg.Controls.Add(Me.GroupBox2)
@@ -389,6 +397,63 @@ Partial Class MainForm
Me.PanelOptAllg.Size = New System.Drawing.Size(1022, 290)
Me.PanelOptAllg.TabIndex = 0
'
+ 'GroupBox5
+ '
+ Me.GroupBox5.Controls.Add(Me.Label5)
+ Me.GroupBox5.Controls.Add(Me.Label4)
+ Me.GroupBox5.Controls.Add(Me.tbMinSpeedLAC)
+ Me.GroupBox5.Controls.Add(Me.Label3)
+ Me.GroupBox5.Controls.Add(Me.Label2)
+ Me.GroupBox5.Location = New System.Drawing.Point(183, 57)
+ Me.GroupBox5.Name = "GroupBox5"
+ Me.GroupBox5.Size = New System.Drawing.Size(260, 100)
+ Me.GroupBox5.TabIndex = 20
+ Me.GroupBox5.TabStop = false
+ Me.GroupBox5.Text = "Look-Ahead Coasting Override"
+ '
+ 'Label5
+ '
+ Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.Label5.Location = New System.Drawing.Point(7, 48)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(247, 36)
+ Me.Label5.TabIndex = 4
+ Me.Label5.Text = "Overrides Look-Ahead Coasting in declaration mode. Leave empty to use default beh"& _
+ "aviour."
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = true
+ Me.Label4.Location = New System.Drawing.Point(10, 44)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(0, 13)
+ Me.Label4.TabIndex = 3
+ '
+ 'tbMinSpeedLAC
+ '
+ Me.tbMinSpeedLAC.Location = New System.Drawing.Point(96, 17)
+ Me.tbMinSpeedLAC.Name = "tbMinSpeedLAC"
+ Me.tbMinSpeedLAC.Size = New System.Drawing.Size(56, 20)
+ Me.tbMinSpeedLAC.TabIndex = 2
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = true
+ Me.Label3.Location = New System.Drawing.Point(158, 20)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(38, 13)
+ Me.Label3.TabIndex = 1
+ Me.Label3.Text = "[km/h]"
+ '
+ 'Label2
+ '
+ Me.Label2.AutoSize = true
+ Me.Label2.Location = New System.Drawing.Point(7, 20)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(64, 13)
+ Me.Label2.TabIndex = 0
+ Me.Label2.Text = "Min. Speed:"
+ '
'GroupBox4
'
Me.GroupBox4.Controls.Add(Me.BtTCfileBrowse)
@@ -429,6 +494,16 @@ Partial Class MainForm
Me.GroupBox3.TabStop = false
Me.GroupBox3.Text = "Misc"
'
+ 'cbSaveVectoRunData
+ '
+ Me.cbSaveVectoRunData.AutoSize = true
+ Me.cbSaveVectoRunData.Location = New System.Drawing.Point(7, 86)
+ Me.cbSaveVectoRunData.Name = "cbSaveVectoRunData"
+ Me.cbSaveVectoRunData.Size = New System.Drawing.Size(166, 17)
+ Me.cbSaveVectoRunData.TabIndex = 19
+ Me.cbSaveVectoRunData.Text = "Export ModelData (EXPERT!)"
+ Me.cbSaveVectoRunData.UseVisualStyleBackColor = true
+ '
'cbActVmod
'
Me.cbActVmod.Location = New System.Drawing.Point(6, 34)
@@ -855,16 +930,6 @@ Partial Class MainForm
Me.ShowInFolderToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
Me.ShowInFolderToolStripMenuItem.Text = "Show in Folder"
'
- 'cbSaveVectoRunData
- '
- Me.cbSaveVectoRunData.AutoSize = true
- Me.cbSaveVectoRunData.Location = New System.Drawing.Point(7, 86)
- Me.cbSaveVectoRunData.Name = "cbSaveVectoRunData"
- Me.cbSaveVectoRunData.Size = New System.Drawing.Size(166, 17)
- Me.cbSaveVectoRunData.TabIndex = 19
- Me.cbSaveVectoRunData.Text = "Export ModelData (EXPERT!)"
- Me.cbSaveVectoRunData.UseVisualStyleBackColor = true
- '
'MainForm
'
Me.AcceptButton = Me.btStartV3
@@ -887,6 +952,8 @@ Partial Class MainForm
CType(Me.PictureBox1,System.ComponentModel.ISupportInitialize).EndInit
Me.TabPgOptions.ResumeLayout(false)
Me.PanelOptAllg.ResumeLayout(false)
+ Me.GroupBox5.ResumeLayout(false)
+ Me.GroupBox5.PerformLayout
Me.GroupBox4.ResumeLayout(false)
Me.GroupBox4.PerformLayout
Me.GroupBox3.ResumeLayout(false)
@@ -1002,4 +1069,10 @@ End Sub
Friend WithEvents tbOutputFolder As TextBox
Friend WithEvents BtTCfileBrowse As Button
Friend WithEvents cbSaveVectoRunData As CheckBox
+ Friend WithEvents GroupBox5 As GroupBox
+ Friend WithEvents Label4 As Label
+ Friend WithEvents tbMinSpeedLAC As TextBox
+ Friend WithEvents Label3 As Label
+ Friend WithEvents Label2 As Label
+ Friend WithEvents Label5 As Label
End Class
diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb
index c480ad7897174ff9846f191a51db909dba2997c1..2c021df4742c7789851282c8c82e231ac90d345e 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/VECTO/GUI/MainForm.vb
@@ -53,6 +53,7 @@ Imports TUGraz.VectoCore.InputData.FileIO.XML.Declaration
Imports TUGraz.VectoCore.InputData.FileIO.XML.Engineering
Imports TUGraz.VectoCore.Models.Simulation
Imports TUGraz.VectoCore.Models.Declaration
+Imports TUGraz.VectoCore.Models.SimulationComponent.Data
Imports TUGraz.VectoCore.OutputData
Imports TUGraz.VectoCore.OutputData.FileIO
Imports TUGraz.VectoCore.Utils
@@ -1007,7 +1008,16 @@ Imports TUGraz.VectoCore.Utils
fileWriters.Add(runId, fileWriter)
Next
+ ' TODO MQ-20200525: Remove the following loop in production (or after evaluation of LAC!!
+ If not string.IsNullOrWhiteSpace(tbMinSpeedLAC.Text) then
+ for Each run as JobContainer.RunEntry In jobContainer.Runs
+ dim tmpDriver as DriverData = CType(run.Run, VectoRun).GetContainer().RunData.DriverData
+ tmpDriver.LookAheadCoasting.Enabled = True
+ tmpDriver.LookAheadCoasting.MinSpeed = tbMinSpeedLAC.Text.ToDouble().KMPHtoMeterPerSecond()
+ Next
+ end if
+
sender.ReportProgress(0,
New VectoProgress _
With {.Target = "ListBox",
@@ -2139,6 +2149,7 @@ Imports TUGraz.VectoCore.Utils
tbOutputFolder.Text = Path.GetFullPath(filePath)
End Sub
+
End Class
diff --git a/VECTO/GUI/VectoVTPJobForm.Designer.vb b/VECTO/GUI/VectoVTPJobForm.Designer.vb
index 12549309a3187c76de864128a01c3428102a1a12..1d86c0331b9d1827846458b8d584700443883c61 100644
--- a/VECTO/GUI/VectoVTPJobForm.Designer.vb
+++ b/VECTO/GUI/VectoVTPJobForm.Designer.vb
@@ -28,6 +28,7 @@ Partial Class VectoVTPJobForm
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(VectoVTPJobForm))
Me.GrCycles = New System.Windows.Forms.GroupBox()
+ Me.Label12 = New System.Windows.Forms.Label()
Me.Label2 = New System.Windows.Forms.Label()
Me.LvCycles = New System.Windows.Forms.ListView()
Me.ColumnHeader1 = CType(New System.Windows.Forms.ColumnHeader(),System.Windows.Forms.ColumnHeader)
@@ -90,7 +91,9 @@ Partial Class VectoVTPJobForm
Me.Label8 = New System.Windows.Forms.Label()
Me.tbManufacturerRecord = New System.Windows.Forms.TextBox()
Me.ButtonManR = New System.Windows.Forms.Button()
- Me.Label12 = New System.Windows.Forms.Label()
+ Me.Label13 = New System.Windows.Forms.Label()
+ Me.tbC4 = New System.Windows.Forms.TextBox()
+ Me.Label14 = New System.Windows.Forms.Label()
Me.GrCycles.SuspendLayout
Me.GrAux.SuspendLayout
Me.StatusStrip1.SuspendLayout
@@ -121,6 +124,18 @@ Partial Class VectoVTPJobForm
Me.GrCycles.TabStop = false
Me.GrCycles.Text = "Cycles"
'
+ 'Label12
+ '
+ Me.Label12.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
+ Me.Label12.AutoSize = true
+ Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.Label12.Location = New System.Drawing.Point(6, 20)
+ Me.Label12.Name = "Label12"
+ Me.Label12.Size = New System.Drawing.Size(426, 13)
+ Me.Label12.TabIndex = 4
+ Me.Label12.Text = "The fuel cocnsumption in the cycle has to be corrected for standard NCV!"
+ '
'Label2
'
Me.Label2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
@@ -247,7 +262,7 @@ Partial Class VectoVTPJobForm
'StatusStrip1
'
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelGEN})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 635)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 660)
Me.StatusStrip1.Name = "StatusStrip1"
Me.StatusStrip1.Size = New System.Drawing.Size(944, 22)
Me.StatusStrip1.SizingGrip = false
@@ -257,13 +272,13 @@ Partial Class VectoVTPJobForm
'ToolStripStatusLabelGEN
'
Me.ToolStripStatusLabelGEN.Name = "ToolStripStatusLabelGEN"
- Me.ToolStripStatusLabelGEN.Size = New System.Drawing.Size(120, 17)
+ Me.ToolStripStatusLabelGEN.Size = New System.Drawing.Size(119, 17)
Me.ToolStripStatusLabelGEN.Text = "ToolStripStatusLabel1"
'
'ButOK
'
Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(778, 608)
+ Me.ButOK.Location = New System.Drawing.Point(778, 633)
Me.ButOK.Name = "ButOK"
Me.ButOK.Size = New System.Drawing.Size(75, 23)
Me.ButOK.TabIndex = 0
@@ -274,7 +289,7 @@ Partial Class VectoVTPJobForm
'
Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(859, 608)
+ Me.ButCancel.Location = New System.Drawing.Point(859, 633)
Me.ButCancel.Name = "ButCancel"
Me.ButCancel.Size = New System.Drawing.Size(75, 23)
Me.ButCancel.TabIndex = 1
@@ -481,14 +496,17 @@ Partial Class VectoVTPJobForm
'
'GroupBox1
'
+ Me.GroupBox1.Controls.Add(Me.Label13)
Me.GroupBox1.Controls.Add(Me.tbFanDiameter)
+ Me.GroupBox1.Controls.Add(Me.tbC4)
+ Me.GroupBox1.Controls.Add(Me.Label14)
Me.GroupBox1.Controls.Add(Me.Label7)
Me.GroupBox1.Controls.Add(Me.pnFanParameters)
Me.GroupBox1.Controls.Add(Me.PictureBox2)
Me.GroupBox1.Controls.Add(Me.Label6)
Me.GroupBox1.Location = New System.Drawing.Point(10, 496)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(517, 135)
+ Me.GroupBox1.Size = New System.Drawing.Size(517, 144)
Me.GroupBox1.TabIndex = 39
Me.GroupBox1.TabStop = false
Me.GroupBox1.Text = "Fan Power"
@@ -520,15 +538,15 @@ Partial Class VectoVTPJobForm
Me.pnFanParameters.Controls.Add(Me.tbC3)
Me.pnFanParameters.Controls.Add(Me.tbC2)
Me.pnFanParameters.Controls.Add(Me.Label4)
- Me.pnFanParameters.Location = New System.Drawing.Point(290, 39)
+ Me.pnFanParameters.Location = New System.Drawing.Point(290, 36)
Me.pnFanParameters.Name = "pnFanParameters"
- Me.pnFanParameters.Size = New System.Drawing.Size(218, 88)
+ Me.pnFanParameters.Size = New System.Drawing.Size(218, 78)
Me.pnFanParameters.TabIndex = 48
'
'Label11
'
Me.Label11.AutoSize = true
- Me.Label11.Location = New System.Drawing.Point(173, 63)
+ Me.Label11.Location = New System.Drawing.Point(173, 58)
Me.Label11.Name = "Label11"
Me.Label11.Size = New System.Drawing.Size(29, 13)
Me.Label11.TabIndex = 50
@@ -537,7 +555,7 @@ Partial Class VectoVTPJobForm
'Label10
'
Me.Label10.AutoSize = true
- Me.Label10.Location = New System.Drawing.Point(173, 37)
+ Me.Label10.Location = New System.Drawing.Point(173, 32)
Me.Label10.Name = "Label10"
Me.Label10.Size = New System.Drawing.Size(30, 13)
Me.Label10.TabIndex = 49
@@ -546,7 +564,7 @@ Partial Class VectoVTPJobForm
'Label9
'
Me.Label9.AutoSize = true
- Me.Label9.Location = New System.Drawing.Point(173, 11)
+ Me.Label9.Location = New System.Drawing.Point(173, 6)
Me.Label9.Name = "Label9"
Me.Label9.Size = New System.Drawing.Size(30, 13)
Me.Label9.TabIndex = 48
@@ -555,7 +573,7 @@ Partial Class VectoVTPJobForm
'Label1
'
Me.Label1.AutoSize = true
- Me.Label1.Location = New System.Drawing.Point(52, 11)
+ Me.Label1.Location = New System.Drawing.Point(52, 6)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(23, 13)
Me.Label1.TabIndex = 39
@@ -563,7 +581,7 @@ Partial Class VectoVTPJobForm
'
'tbC1
'
- Me.tbC1.Location = New System.Drawing.Point(81, 8)
+ Me.tbC1.Location = New System.Drawing.Point(81, 3)
Me.tbC1.Name = "tbC1"
Me.tbC1.Size = New System.Drawing.Size(86, 20)
Me.tbC1.TabIndex = 40
@@ -571,7 +589,7 @@ Partial Class VectoVTPJobForm
'Label3
'
Me.Label3.AutoSize = true
- Me.Label3.Location = New System.Drawing.Point(52, 37)
+ Me.Label3.Location = New System.Drawing.Point(52, 32)
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(23, 13)
Me.Label3.TabIndex = 41
@@ -579,14 +597,14 @@ Partial Class VectoVTPJobForm
'
'tbC3
'
- Me.tbC3.Location = New System.Drawing.Point(81, 60)
+ Me.tbC3.Location = New System.Drawing.Point(81, 55)
Me.tbC3.Name = "tbC3"
Me.tbC3.Size = New System.Drawing.Size(86, 20)
Me.tbC3.TabIndex = 44
'
'tbC2
'
- Me.tbC2.Location = New System.Drawing.Point(81, 34)
+ Me.tbC2.Location = New System.Drawing.Point(81, 29)
Me.tbC2.Name = "tbC2"
Me.tbC2.Size = New System.Drawing.Size(86, 20)
Me.tbC2.TabIndex = 42
@@ -594,7 +612,7 @@ Partial Class VectoVTPJobForm
'Label4
'
Me.Label4.AutoSize = true
- Me.Label4.Location = New System.Drawing.Point(52, 63)
+ Me.Label4.Location = New System.Drawing.Point(52, 58)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(23, 13)
Me.Label4.TabIndex = 43
@@ -687,17 +705,30 @@ Partial Class VectoVTPJobForm
Me.ButtonManR.TabStop = false
Me.ButtonManR.UseVisualStyleBackColor = true
'
- 'Label12
+ 'Label13
'
- Me.Label12.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles)
- Me.Label12.AutoSize = true
- Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
- Me.Label12.Location = New System.Drawing.Point(6, 20)
- Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(426, 13)
- Me.Label12.TabIndex = 4
- Me.Label12.Text = "The fuel cocnsumption in the cycle has to be corrected for standard NCV!"
+ Me.Label13.AutoSize = true
+ Me.Label13.Location = New System.Drawing.Point(463, 120)
+ Me.Label13.Name = "Label13"
+ Me.Label13.Size = New System.Drawing.Size(16, 13)
+ Me.Label13.TabIndex = 53
+ Me.Label13.Text = "[-]"
+ '
+ 'tbC4
+ '
+ Me.tbC4.Location = New System.Drawing.Point(371, 117)
+ Me.tbC4.Name = "tbC4"
+ Me.tbC4.Size = New System.Drawing.Size(86, 20)
+ Me.tbC4.TabIndex = 52
+ '
+ 'Label14
+ '
+ Me.Label14.AutoSize = true
+ Me.Label14.Location = New System.Drawing.Point(342, 120)
+ Me.Label14.Name = "Label14"
+ Me.Label14.Size = New System.Drawing.Size(23, 13)
+ Me.Label14.TabIndex = 51
+ Me.Label14.Text = "C4:"
'
'VectoVTPJobForm
'
@@ -705,7 +736,7 @@ Partial Class VectoVTPJobForm
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(944, 657)
+ Me.ClientSize = New System.Drawing.Size(944, 682)
Me.Controls.Add(Me.pnManufacturerRecord)
Me.Controls.Add(Me.Label5)
Me.Controls.Add(Me.GroupBox1)
@@ -819,4 +850,7 @@ End Sub
Friend WithEvents Label10 As Label
Friend WithEvents Label9 As Label
Friend WithEvents Label12 As Label
+ Friend WithEvents Label13 As Label
+ Friend WithEvents tbC4 As TextBox
+ Friend WithEvents Label14 As Label
End Class
diff --git a/VECTO/GUI/VectoVTPJobForm.vb b/VECTO/GUI/VectoVTPJobForm.vb
index 8aa3288d1070c91b92a5df6f1bcf646b9076f4d9..828de00c9c791af6bd90786996d037c764ea13e2 100644
--- a/VECTO/GUI/VectoVTPJobForm.vb
+++ b/VECTO/GUI/VectoVTPJobForm.vb
@@ -212,6 +212,12 @@ Public Class VectoVTPJobForm
tbC1.Text = DeclarationData.VTPMode.FanParameters(0).ToGUIFormat()
tbC2.Text = DeclarationData.VTPMode.FanParameters(1).ToGUIFormat()
tbC3.Text = DeclarationData.VTPMode.FanParameters(2).ToGUIFormat()
+ Dim coefficientsD As Double() = vectoJob.FanPowerCoefficents.ToArray()
+ If (coefficientsD.Length >= 4) then
+ tbC4.Text = coefficientsD(3).ToGUIFormat()
+ Else
+ tbC4.Text = "1"
+ End If
Else
Dim coefficients As Double() = vectoJob.FanPowerCoefficents.ToArray()
If (coefficients.Length >= 1) Then
@@ -223,6 +229,11 @@ Public Class VectoVTPJobForm
If (coefficients.Length >= 3) Then
tbC3.Text = coefficients(2).ToGUIFormat()
End If
+ If (coefficients.Length >= 4) then
+ tbC4.Text = coefficients(3).ToGUIFormat()
+ Else
+ tbC4.Text = "1"
+ End If
End If
tbFanDiameter.Text = (vectoJob.FanDiameter.Value()*1000).ToGUIFormat()
Try
@@ -304,7 +315,8 @@ Public Class VectoVTPJobForm
vectoJob.FanCoefficients = New Double() { _
tbC1.Text.ToDouble(0),
tbC2.Text.ToDouble(0),
- tbC3.Text.ToDouble(0)
+ tbC3.Text.ToDouble(0),
+ tbC4.Text.ToDouble(0)
}
vectoJob.FanDiameter = (tbFanDiameter.Text.ToDouble(0)/1000).SI (of Meter)
@@ -357,6 +369,7 @@ Public Class VectoVTPJobForm
tbC1.Text = DeclarationData.VTPMode.FanParameters(0).ToGUIFormat()
tbc2.Text = DeclarationData.VTPMode.FanParameters(1).ToGUIFormat()
tbC3.Text = DeclarationData.VTPMode.FanParameters(2).ToGUIFormat()
+ tbC4.Text = "1"
End Sub
diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb
index 91425bd51001890821fdacad8735ebf38b310eae..480eb63c0ac9b0a37b8eb7b891402ec11be606c0 100644
--- a/VECTO/Input Files/Engine.vb
+++ b/VECTO/Input Files/Engine.vb
@@ -651,7 +651,7 @@ Public Class DummyVehicle
Public Property Loading As Kilogram Implements IVehicleEngineeringInputData.Loading
Public Property DynamicTyreRadius As Meter Implements IVehicleEngineeringInputData.DynamicTyreRadius
Public Property Height As Meter Implements IVehicleEngineeringInputData.Height
- Public ReadOnly Property FloorType As FloorType Implements IVehicleDeclarationInputData.FloorType
+ Public ReadOnly Property LowEntry As Boolean Implements IVehicleDeclarationInputData.LowEntry
Public ReadOnly Property Articulated As Boolean Implements IVehicleDeclarationInputData.Articulated
Public ReadOnly Property IVehicleDeclarationInputData_Height As Meter Implements IVehicleDeclarationInputData.Height
Public ReadOnly Property Length As Meter Implements IVehicleDeclarationInputData.Length
diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb
index 53ae63adeec2768c1aabfb102dffccb9fc2114c7..0b1fb810670dc950b1b9bc924bb7820227b659cf 100644
--- a/VECTO/Input Files/Gearbox.vb
+++ b/VECTO/Input Files/Gearbox.vb
@@ -835,7 +835,7 @@ Public Class MockEngineeringVehicle
Public ReadOnly Property NumberOfPassengersUpperDeck As Integer Implements IVehicleDeclarationInputData.NumberOfPassengersUpperDeck
Public ReadOnly Property NumberOfPassengersLowerDeck As Integer Implements IVehicleDeclarationInputData.NumberOfPassengersLowerDeck
Public ReadOnly Property VehicleCode As VehicleCode Implements IVehicleDeclarationInputData.VehicleCode
- Public ReadOnly Property FloorType As FloorType Implements IVehicleDeclarationInputData.FloorType
+ Public ReadOnly Property LowEntry As Boolean Implements IVehicleDeclarationInputData.LowEntry
Public ReadOnly Property Articulated As Boolean Implements IVehicleDeclarationInputData.Articulated
Public ReadOnly Property IVehicleDeclarationInputData_Height As Meter Implements IVehicleDeclarationInputData.Height
Public Property CurbMassExtra As Kilogram Implements IVehicleEngineeringInputData.CurbMassExtra
diff --git a/VECTO/Input Files/MockVehicleInputData.vb b/VECTO/Input Files/MockVehicleInputData.vb
index cf92997a6a7564e30a5091638280228cc1c3c094..f563a7ae0277aced3c35b8f9b645d2d3ef10880f 100644
--- a/VECTO/Input Files/MockVehicleInputData.vb
+++ b/VECTO/Input Files/MockVehicleInputData.vb
@@ -43,7 +43,7 @@ Public Class MockVehicleInputData
Public ReadOnly Property NumberOfPassengersUpperDeck As Integer Implements IVehicleDeclarationInputData.NumberOfPassengersUpperDeck
Public ReadOnly Property NumberOfPassengersLowerDeck As Integer Implements IVehicleDeclarationInputData.NumberOfPassengersLowerDeck
Public ReadOnly Property VehicleCode As VehicleCode Implements IVehicleDeclarationInputData.VehicleCode
- Public ReadOnly Property FloorType As FloorType Implements IVehicleDeclarationInputData.FloorType
+ Public ReadOnly Property LowEntry As Boolean Implements IVehicleDeclarationInputData.LowEntry
Public ReadOnly Property Articulated As Boolean Implements IVehicleDeclarationInputData.Articulated
Public ReadOnly Property Height As Meter Implements IVehicleDeclarationInputData.Height
Public ReadOnly Property Length As Meter Implements IVehicleDeclarationInputData.Length
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 365da6a37b5976aff790e703f8eb6ccd6cde9601..c25edd87a151516290c50bf1daf69710555e3096 100644
--- a/VECTO/Input Files/Vehicle.vb
+++ b/VECTO/Input Files/Vehicle.vb
@@ -763,7 +763,7 @@ Public Class Vehicle
Public ReadOnly Property NumberOfPassengersUpperDeck As Integer Implements IVehicleDeclarationInputData.NumberOfPassengersUpperDeck
Public ReadOnly Property NumberOfPassengersLowerDeck As Integer Implements IVehicleDeclarationInputData.NumberOfPassengersLowerDeck
Public ReadOnly Property VehicleCode As VehicleCode Implements IVehicleDeclarationInputData.VehicleCode
- Public ReadOnly Property FloorType As FloorType Implements IVehicleDeclarationInputData.FloorType
+ Public ReadOnly Property LowEntry As Boolean Implements IVehicleDeclarationInputData.LowEntry
Public ReadOnly Property Components As IVehicleComponentsDeclaration Implements IVehicleDeclarationInputData.Components
get
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index ac437b23eefabe3b0cd4c8e0fbc80b91b43ad838..b1e8f51030f0829ba49b657492f99c3ff8d01536 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -143,6 +143,7 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<DefineConstants>
</DefineConstants>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Deploy|x86'">
<DefineTrace>true</DefineTrace>
diff --git a/VECTO3GUI/VECTO3GUI.csproj b/VECTO3GUI/VECTO3GUI.csproj
index 22bdc6c3d529df10cab4c417e4429111fb7ed927..0fa658def1080cf9de2441da36aacf057ec5b21a 100644
--- a/VECTO3GUI/VECTO3GUI.csproj
+++ b/VECTO3GUI/VECTO3GUI.csproj
@@ -24,6 +24,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,6 +34,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Resources\Icon2.ico</ApplicationIcon>
diff --git a/VECTO3GUI/ViewModel/Adapter/Declaration/VehicleDeclarationAdapter.cs b/VECTO3GUI/ViewModel/Adapter/Declaration/VehicleDeclarationAdapter.cs
index b44c0e8e4a82326bae79549efa0d2d266a20169b..dc508f3a4fde2e9f0983888cb6c0a86e13f92c18 100644
--- a/VECTO3GUI/ViewModel/Adapter/Declaration/VehicleDeclarationAdapter.cs
+++ b/VECTO3GUI/ViewModel/Adapter/Declaration/VehicleDeclarationAdapter.cs
@@ -111,7 +111,7 @@ namespace VECTO3GUI.ViewModel.Adapter.Declaration
public int NumberOfPassengersUpperDeck { get; }
public int NumberOfPassengersLowerDeck { get; }
public VehicleCode VehicleCode { get; }
- public FloorType FloorType { get; }
+ public bool LowEntry { get; }
public bool Articulated { get; }
public Meter Height { get; }
public Meter Length { get; }
diff --git a/VECTO3GUI/ViewModel/Impl/CompleteVehicleBusViewModel.cs b/VECTO3GUI/ViewModel/Impl/CompleteVehicleBusViewModel.cs
index 31a15bec324cea09ece2bf4cae57ba3eddc2e29d..a737e015259b0f74403dedfe49aad9955f06c68a 100644
--- a/VECTO3GUI/ViewModel/Impl/CompleteVehicleBusViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/CompleteVehicleBusViewModel.cs
@@ -282,7 +282,7 @@ namespace VECTO3GUI.ViewModel.Impl
NgTankSystem = vehicle.TankSystem;
NumberOfPassengersLowerDeck = vehicle.NumberOfPassengersLowerDeck;
NumberOfPassengersUpperDeck = vehicle.NumberOfPassengersUpperDeck;
- LowEntry = vehicle.FloorType == FloorType.LowFloor;
+ LowEntry = vehicle.LowEntry;
HeightIntegratedBody = vehicle.Height;
VehicleLength = vehicle.Length;
VehicleWidth = vehicle.Width;
diff --git a/VECTO3GUI/ViewModel/Impl/JoblistViewModel.cs b/VECTO3GUI/ViewModel/Impl/JoblistViewModel.cs
index ffcbd5b9c155760ed9eeed82621994e0796b2b82..c4a814071f5c6d51ba560ae754c69a2c6819251d 100644
--- a/VECTO3GUI/ViewModel/Impl/JoblistViewModel.cs
+++ b/VECTO3GUI/ViewModel/Impl/JoblistViewModel.cs
@@ -21,12 +21,14 @@ using NLog.Targets;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Resources;
+using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore;
using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.FileIO.JSON;
using TUGraz.VectoCore.InputData.FileIO.XML;
using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider;
using TUGraz.VectoCore.Models.Simulation.Impl;
+using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.OutputData;
using TUGraz.VectoCore.OutputData.FileIO;
using VECTO3GUI.Util;
@@ -85,6 +87,7 @@ namespace VECTO3GUI.ViewModel.Impl
private ICommand _browseOutputDirectory;
private bool _writeModelData;
private ICommand _aboutViewCommand;
+ private string _lookAheadMinSpeedOverride;
#endregion
@@ -144,6 +147,12 @@ namespace VECTO3GUI.ViewModel.Impl
set { SetProperty(ref _progress, value); }
}
+ public string LookAheadMinSpeedOverride
+ {
+ get { return _lookAheadMinSpeedOverride; }
+ set { SetProperty(ref _lookAheadMinSpeedOverride, value); }
+ }
+
#endregion
@@ -904,11 +913,12 @@ namespace VECTO3GUI.ViewModel.Impl
var rootNode = xdoc.Root?.Name.LocalName ?? "";
if (XMLNames.VectoInputEngineering.Equals(rootNode, StringComparison.InvariantCultureIgnoreCase)) {
input = xmlReader.CreateEngineering(fullFileName);
+ mode = ExecutionMode.Engineering;
} else if (XMLNames.VectoInputDeclaration.Equals(rootNode, StringComparison.InvariantCultureIgnoreCase)) {
using (var reader = XmlReader.Create(fullFileName)) {
input = xmlReader.CreateDeclaration(reader);
}
- mode = ExecutionMode.Engineering;
+ mode = ExecutionMode.Declaration;
}
break;
}
@@ -935,6 +945,15 @@ namespace VECTO3GUI.ViewModel.Impl
fileWriters.Add(runId, fileWriter);
}
+ // TODO MQ-20200525: Remove the following loop in production (or after evaluation of LAC!!
+ if (!string.IsNullOrWhiteSpace(LookAheadMinSpeedOverride)) {
+ foreach (var run in jobContainer.Runs) {
+ var tmpDriver = ((VectoRun)run.Run).GetContainer().RunData.DriverData;
+ tmpDriver.LookAheadCoasting.Enabled = true;
+ tmpDriver.LookAheadCoasting.MinSpeed = LookAheadMinSpeedOverride.ToDouble().KMPHtoMeterPerSecond();
+ }
+ }
+
sender.ReportProgress(
0,
new VectoSimulationProgress() {
@@ -945,7 +964,8 @@ namespace VECTO3GUI.ViewModel.Impl
MessageBox.Show(
$"ERROR running job {Path.GetFileName(jobEntry.JobEntryFilePath)}: {ex.Message}", "Error", MessageBoxButton.OK,
MessageBoxImage.Exclamation);
- sender.ReportProgress(0, new VectoSimulationProgress() {Type = VectoSimulationProgress.MsgType.StatusMessage, Message = ex.Message});
+ sender.ReportProgress(
+ 0, new VectoSimulationProgress() { Type = VectoSimulationProgress.MsgType.StatusMessage, Message = ex.Message });
}
}
diff --git a/VECTO3GUI/Views/JoblistView.xaml b/VECTO3GUI/Views/JoblistView.xaml
index 032f30a0b4026c72f9f3386d34130c6328cf2e8e..694d430773a04c33b9da0970aadc8c2f0491b58a 100644
--- a/VECTO3GUI/Views/JoblistView.xaml
+++ b/VECTO3GUI/Views/JoblistView.xaml
@@ -208,7 +208,7 @@
</StackPanel>
</GroupBox>
</StackPanel>
- <StackPanel Orientation="Vertical" Margin="5,0,0,0">
+ <StackPanel Orientation="Vertical" Margin="5,0,0,0" MaxWidth="300">
<GroupBox Header ="Output Directory">
<StackPanel Orientation="Horizontal">
<TextBox Width="200" Text="{Binding OutputDirectory}"/>
@@ -225,6 +225,16 @@
<CheckBox IsChecked="{Binding WriteModelData}" Margin="0,0,0,3">Write internal model data (EXPERT!)</CheckBox>
</StackPanel>
</GroupBox>
+ <GroupBox Header="Look-Ahead Coasting Override (DEV!)" Margin="0,5,0,0">
+ <StackPanel Orientation="Vertical">
+ <StackPanel Orientation="Horizontal">
+ <TextBlock>Min. Speed:</TextBlock>
+ <TextBox MinWidth="50" Margin="10,0,4,0" Text="{Binding LookAheadMinSpeedOverride}"/>
+ <TextBlock>[km/h]</TextBlock>
+ </StackPanel>
+ <TextBlock FontStyle="Italic" TextWrapping="Wrap" Margin="0,5,0,0">Overrides Lok-Ahead Coasting in declaration mode. Leave empty to use default behavious.</TextBlock>
+ </StackPanel>
+ </GroupBox>
</StackPanel>
</StackPanel>
diff --git a/VectoCommon/VectoCommon/BusAuxiliaries/BusHVACSystemConfiguration.cs b/VectoCommon/VectoCommon/BusAuxiliaries/BusHVACSystemConfiguration.cs
index 771e98437feba87b02147df69b2b181a45dbd458..911df16a567262016d7318f8c47b5166da2b3a95 100644
--- a/VectoCommon/VectoCommon/BusAuxiliaries/BusHVACSystemConfiguration.cs
+++ b/VectoCommon/VectoCommon/BusAuxiliaries/BusHVACSystemConfiguration.cs
@@ -1,4 +1,5 @@
-using System.Text.RegularExpressions;
+using System;
+using System.Text.RegularExpressions;
using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCommon.BusAuxiliaries {
@@ -14,6 +15,7 @@ namespace TUGraz.VectoCommon.BusAuxiliaries {
Configuration7,
Configuration8,
Configuration9,
+ Configuration10,
}
public static class BusHVACSystemConfigurationHelper
@@ -52,5 +54,28 @@ namespace TUGraz.VectoCommon.BusAuxiliaries {
return GetName(hvacConfiguration);
}
+ public static bool RequiresDriverAC(this BusHVACSystemConfiguration hvacConfig)
+ {
+ switch (hvacConfig) {
+ case BusHVACSystemConfiguration.Configuration2:
+ case BusHVACSystemConfiguration.Configuration4:
+ case BusHVACSystemConfiguration.Configuration7:
+ case BusHVACSystemConfiguration.Configuration9:
+ return true;
+ }
+
+ return false;
+ }
+
+ public static bool RequiresPassengerAC(this BusHVACSystemConfiguration hvacConfig)
+ {
+ switch (hvacConfig) {
+ case BusHVACSystemConfiguration.Configuration1:
+ case BusHVACSystemConfiguration.Configuration2:
+ return false;
+ }
+
+ return true;
+ }
}
}
\ No newline at end of file
diff --git a/VectoCommon/VectoCommon/BusAuxiliaries/FloorType.cs b/VectoCommon/VectoCommon/BusAuxiliaries/FloorType.cs
index 9f9553a08266a7a8fec1fc6f9278c2ceea5e9aab..5e194eb3d677ba12eed4dd3e4c608359732c17e1 100644
--- a/VectoCommon/VectoCommon/BusAuxiliaries/FloorType.cs
+++ b/VectoCommon/VectoCommon/BusAuxiliaries/FloorType.cs
@@ -9,21 +9,21 @@ namespace TUGraz.VectoCommon.BusAuxiliaries {
SemiLowFloor, // no longer required?
}
- public static class FloorTypeHelper
- {
- public static string GetLabel(this FloorType self)
- {
- switch (self)
- {
- case FloorType.SemiLowFloor:
- case FloorType.LowFloor:
- return "Low Floor";
- case FloorType.HighFloor:
- return "High Floor";
- default:
- return "Unknown";
-
- }
- }
- }
+ //public static class FloorTypeHelper
+ //{
+ // public static string GetLabel(this FloorType self)
+ // {
+ // switch (self)
+ // {
+ // case FloorType.SemiLowFloor:
+ // case FloorType.LowFloor:
+ // return "Low Floor";
+ // case FloorType.HighFloor:
+ // return "High Floor";
+ // default:
+ // return "Unknown";
+
+ // }
+ // }
+ //}
}
\ No newline at end of file
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 076b0d63f5b5feed1faf34e53babc06109bff2e9..434813f62e620e50ce7fcb23e8a855a471411fb9 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -170,7 +170,8 @@ namespace TUGraz.VectoCommon.InputData
int NumberOfPassengersLowerDeck { get; }
VehicleCode VehicleCode { get; }
- FloorType FloorType { get; }
+
+ bool LowEntry { get; }
bool Articulated { get; }
diff --git a/VectoCore/VectoCore/Configuration/Constants.cs b/VectoCore/VectoCore/Configuration/Constants.cs
index da607ac4a89d2a72e67993f86d5513cb9eead4b0..51a0fbea122ef86c85a95493e229091d89a00145 100644
--- a/VectoCore/VectoCore/Configuration/Constants.cs
+++ b/VectoCore/VectoCore/Configuration/Constants.cs
@@ -105,7 +105,7 @@ namespace TUGraz.VectoCore.Configuration
{
public static readonly Volt PowernetVoltage = 28.3.SI<Volt>();
- public const double AlternatorGearEfficiency = 0.92;
+ public const double AlternatorGearEfficiency = 1;
public const double StoredEnergyEfficiency = 0.935;
}
@@ -367,7 +367,7 @@ namespace TUGraz.VectoCore.Configuration
public const double FactorAngleDrive = 0.75;
- public const double RetarderGenericFactor = 0.5;
+ public const double RetarderGenericFactor = 1;
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
index a9d88213e731cb868f97465c8f9bd78c13cf7476..82417bc977800505bc30c9c94b45ad787d01e4dd 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
@@ -426,7 +426,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
public int NumberOfPassengersUpperDeck { get { return 0; } }
public int NumberOfPassengersLowerDeck { get { return 0; } }
public VehicleCode VehicleCode { get { return VehicleCode.NOT_APPLICABLE; } }
- public FloorType FloorType { get { return VehicleData.FloorType; } }
+ public bool LowEntry { get { return VehicleData.LowEntry; } }
IVehicleComponentsDeclaration IVehicleDeclarationInputData.Components
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index a2e87516e23a904669acaaf6d224c98d23364410..6721f9ea7e22a585ad70b56be1a955d32d37d68c 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -607,7 +607,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
get { return VehicleCode.NOT_APPLICABLE; }
}
- public virtual FloorType FloorType { get { return FloorType.Unknown; } }
+ public virtual bool LowEntry { get { return false; } }
IVehicleComponentsDeclaration IVehicleDeclarationInputData.Components
{
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index f1216091c0913549fa9e2d7a7e171d12ee650fdf..323297f56edeb8edbd3b175686abbb1af5eed9e3 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -293,9 +293,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
get { return VehicleCode.NOT_APPLICABLE; }
}
- public virtual FloorType FloorType
+ public virtual bool LowEntry
{
- get { return FloorType.Unknown; }
+ get { return false; }
}
public virtual bool Articulated
@@ -868,9 +868,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
#endregion
- public override FloorType FloorType
+ public override bool LowEntry
{
- get { return GetBool(XMLNames.Bus_LowEntry) ? FloorType.LowFloor : FloorType.HighFloor; }
+ get { return GetBool(XMLNames.Bus_LowEntry); }
}
public override Meter EntranceHeight
@@ -1047,7 +1047,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
public Watt MaxNetPower2 { get; }
public RegistrationClass RegisteredClass { get; }
public VehicleCode VehicleCode { get; }
- public FloorType FloorType { get; }
+ public bool LowEntry { get; }
public bool Articulated { get { return GetBool(XMLNames.Vehicle_Articulated); } }
public Meter Height { get; }
public Meter Length { get; }
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
index 76b6bc65157a8d83f3acf595741f76222acf4ea6..0a544541a50d81c2209e104e4ee94e4734ad32bc 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
@@ -168,7 +168,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
public virtual int NumberOfPassengersUpperDeck { get { return 0; } }
public virtual int NumberOfPassengersLowerDeck { get { return 0; } }
public virtual VehicleCode VehicleCode { get { return VehicleCode.NOT_APPLICABLE; } }
- public virtual FloorType FloorType { get { return FloorType.Unknown; } }
+ public virtual bool LowEntry { get { return false; } }
public virtual bool Articulated { get { return false; } }
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
index 854ee594830d21bc5430cf70fff7373d259897af..d7ec92a767e44cea008df0700fef2962ebb499a9 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/AbstractSimulationDataAdapter.cs
@@ -172,7 +172,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
};
}
- protected virtual TransmissionLossMap CreateGearLossMap(ITransmissionInputData gear, uint i, bool useEfficiencyFallback, VehicleCategory vehicleCategory )
+ protected virtual TransmissionLossMap CreateGearLossMap(ITransmissionInputData gear, uint i, bool useEfficiencyFallback, VehicleCategory vehicleCategory, GearboxType gearboxType)
{
if (gear.LossMap != null) {
return TransmissionLossMapReader.Create(gear.LossMap, gear.Ratio, string.Format("Gear {0}", i + 1), true);
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusGeneric.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusGeneric.cs
index ccdf65ecf55bf648d44f956436542e912c3820b3..0762eecc7a64b427f9319a542307a4f81b402fdc 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusGeneric.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusGeneric.cs
@@ -1,25 +1,14 @@
using System;
using System.Collections.Generic;
-using System.Linq;
-using TUGraz.VectoCommon.BusAuxiliaries;
using TUGraz.VectoCommon.Exceptions;
using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
-using TUGraz.VectoCore.Configuration;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
-using TUGraz.VectoCore.Models.BusAuxiliaries;
-using TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electrics;
-using TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.HVAC;
-using TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Pneumatics;
-using TUGraz.VectoCore.Models.BusAuxiliaries.Interfaces.DownstreamModules.Electrics;
using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.GenericModelData;
-using TUGraz.VectoCore.Models.Simulation.Data;
-using TUGraz.VectoCore.Models.SimulationComponent;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
-using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
{
@@ -31,9 +20,23 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
public const double GearEfficiencyDirectGear = 0.98;
public const double GearEfficiencyIndirectGear = 0.96;
+ public const double GearEfficiencyAT = 0.925;
-
+ #region Overrides of DeclarationDataAdapterPrimaryBus
+
+ public override VehicleData CreateVehicleData(
+ IVehicleDeclarationInputData data, Segment segment, Mission mission, KeyValuePair<LoadingType, Tuple<Kilogram, double?>> loading)
+ {
+ var retVal = base.CreateVehicleData(data, segment, mission, loading);
+ retVal.GrossVehicleMass = data.GrossVehicleMassRating;
+ if (retVal.TotalVehicleMass.IsGreater(retVal.GrossVehicleMass)) {
+ throw new VectoException("Total Vehicle Mass exceeds Gross Vehicle Mass for completed bus generic ({0}/{1})", retVal.TotalVehicleMass, retVal.GrossVehicleMass);
+ }
+ return retVal;
+ }
+
+ #endregion
// The model parameters for the completed bus with generic power train and generic body is basically the same as the primary bus
// only powertrain components are different
@@ -66,11 +69,13 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
#region Overrides of AbstractSimulationDataAdapter
- protected override TransmissionLossMap CreateGearLossMap(
- ITransmissionInputData gear, uint i, bool useEfficiencyFallback, VehicleCategory vehicleCategory)
+ protected override TransmissionLossMap CreateGearLossMap(ITransmissionInputData gear, uint i, bool useEfficiencyFallback, VehicleCategory vehicleCategory, GearboxType gearboxType)
{
+ if (gearboxType.AutomaticTransmission()) {
+ return TransmissionLossMapReader.Create(GearEfficiencyAT, gear.Ratio, $"Gear {i + 1}");
+ }
return TransmissionLossMapReader.Create(
- gear.Ratio.IsEqual(1) ? GearEfficiencyDirectGear :GearEfficiencyIndirectGear, gear.Ratio, $"Gear {i + 1}");
+ gear.Ratio.IsEqual(1) ? GearEfficiencyDirectGear : GearEfficiencyIndirectGear, gear.Ratio, $"Gear {i + 1}");
}
protected override void CretateTCFirstGearATPowerSplit(GearData gearData, uint i, ShiftPolygon shiftPolygon)
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
index 38c89f5b2f28c75f34c2d52dcd60bd40b1e270af..f2562ff750a83fac2a93942ea6fa2f588cfaf87b 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
@@ -47,7 +47,9 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
vehicleData.RegisteredClass = completedVehicle.RegisteredClass;
vehicleData.VehicleCode = completedVehicle.VehicleCode;
-
+ if (vehicleData.TotalVehicleMass.IsGreater(vehicleData.GrossVehicleMass)) {
+ throw new VectoException("Total Vehicle Mass exceeds Gross Vehicle Mass for completed bus specific ({0}/{1})", vehicleData.TotalVehicleMass, vehicleData.GrossVehicleMass);
+ }
return vehicleData;
}
@@ -95,7 +97,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
primaryBusAuxiliaries, completedVehicle),
PneumaticAuxillariesConfig = CreatePneumaticAuxConfig(runData.Retarder.Type),
Actuations = actuations,
- SSMInputs = GetCompletedSSMInput(mission, completedVehicle, primaryBusAuxiliaries, runData.Loading),
+ SSMInputs = GetCompletedSSMInput(mission, completedVehicle, primaryVehicle, runData.Loading),
VehicleData = runData.VehicleData
};
}
@@ -175,35 +177,51 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
}
private SSMInputs GetCompletedSSMInput(Mission mission, IVehicleDeclarationInputData completedVehicle,
- IBusAuxiliariesDeclarationData primaryBusAux, LoadingType loadingType)
+ IVehicleDeclarationInputData primaryVehicle, LoadingType loadingType)
{
var isDoubleDecker = completedVehicle.VehicleCode.IsDoubleDeckerBus();
var hvacConfiguration = completedVehicle.Components.BusAuxiliaries.HVACAux.SystemConfiguration;
- var hvacBusLength = hvacConfiguration == BusHVACSystemConfiguration.Configuration2
- ? 2 * Constants.BusParameters.DriverCompartmentLength
- : completedVehicle.Length;
+ var busAux = completedVehicle.Components.BusAuxiliaries.HVACAux;
- var hvacBusHeight = DeclarationData.BusAuxiliaries.CalculateInternalHeight(completedVehicle.VehicleCode, completedVehicle.Height);
- var hvacBusWidth = DeclarationData.BusAuxiliaries.CorrectedBusWidth(completedVehicle.Width);
- var coolingPower = CalculateMaxCoolingPower(completedVehicle, mission);
+ if (hvacConfiguration.RequiresDriverAC() && (busAux.CompressorTypeDriver == ACCompressorType.None || busAux.CompressorTypeDriver == ACCompressorType.Unknown)) {
+ throw new VectoException("HVAC System Configuration {0} requires DriverAC Technology", hvacConfiguration);
+ }
- var busAux = completedVehicle.Components.BusAuxiliaries.HVACAux;
+ if (hvacConfiguration.RequiresPassengerAC() && (busAux.CompressorTypePassenger == ACCompressorType.None || busAux.CompressorTypePassenger == ACCompressorType.Unknown)) {
+ throw new VectoException("HVAC System Configuration {0} requires PassengerAC Technology", hvacConfiguration);
+ }
+
+ var internalLength = hvacConfiguration == BusHVACSystemConfiguration.Configuration2
+ ? 2 * Constants.BusParameters.DriverCompartmentLength // OK
+ : DeclarationData.BusAuxiliaries.CalculateInternalLength(
+ completedVehicle.Length, completedVehicle.VehicleCode,
+ completedVehicle.NumberOfPassengersLowerDeck);
+ var correctionLengthDrivetrainVolume = DeclarationData.BusAuxiliaries.CorrectionLengthDrivetrainVolume(
+ completedVehicle.VehicleCode, completedVehicle.LowEntry, primaryVehicle.AxleConfiguration.NumAxles(),
+ primaryVehicle.Articulated);
+
+ var internalHeight = DeclarationData.BusAuxiliaries.CalculateInternalHeight(completedVehicle.VehicleCode, completedVehicle.RegisteredClass, completedVehicle.Height);
+ var correctedBusWidth = DeclarationData.BusAuxiliaries.CorrectedBusWidth(completedVehicle.Width);
+
+ var coolingPower = CalculateMaxCoolingPower(completedVehicle, primaryVehicle, mission);
+
+
var floorType = completedVehicle.VehicleCode.GetFloorType();
var ssmInputs =GetDefaulSSMInputs(FuelData.Diesel);
ssmInputs.BusFloorType = completedVehicle.VehicleCode.GetFloorType();
- ssmInputs.Technologies = CreateTechnologyBenefits(completedVehicle, primaryBusAux);
+ ssmInputs.Technologies = CreateTechnologyBenefits(completedVehicle, primaryVehicle.Components.BusAuxiliaries);
ssmInputs.FuelFiredHeaterPower = busAux.AuxHeaterPower;
- ssmInputs.BusWindowSurface = DeclarationData.BusAuxiliaries.WindowHeight(isDoubleDecker) * hvacBusLength +
+ ssmInputs.BusWindowSurface = DeclarationData.BusAuxiliaries.WindowHeight(isDoubleDecker) * internalLength +
DeclarationData.BusAuxiliaries.FrontAndRearWindowArea(isDoubleDecker);
- ssmInputs.BusSurfaceArea = 2 * (hvacBusLength * hvacBusWidth + hvacBusLength *
- completedVehicle.Height + hvacBusWidth * completedVehicle.Height);
- ssmInputs.BusVolume = hvacBusLength * hvacBusWidth * hvacBusHeight;
+ ssmInputs.BusSurfaceArea = 2 * (completedVehicle.Length * correctedBusWidth + internalLength *
+ internalHeight + (isDoubleDecker ? 2.0 : 1.0) * correctedBusWidth * completedVehicle.Height); // use equations sent by Tobias
+ ssmInputs.BusVolume = (internalLength - correctionLengthDrivetrainVolume) * correctedBusWidth * internalHeight;
ssmInputs.UValue = DeclarationData.BusAuxiliaries.UValue(completedVehicle.VehicleCode.GetFloorType());
ssmInputs.NumberOfPassengers = GetNumberOfPassengers(
- mission, hvacBusLength, hvacBusWidth,
+ mission, internalLength, correctedBusWidth,
completedVehicle.NumberOfPassengersLowerDeck + completedVehicle.NumberOfPassengersUpperDeck, loadingType) + 1; // add driver for 'heat input'
ssmInputs.VentilationRate = DeclarationData.BusAuxiliaries.VentilationRate(hvacConfiguration, false);
ssmInputs.VentilationRateHeating = DeclarationData.BusAuxiliaries.VentilationRate(hvacConfiguration, true);
@@ -266,16 +284,20 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
- protected override Tuple<Watt, Watt> CalculateMaxCoolingPower(IVehicleDeclarationInputData completedVehicle,
+ protected override Tuple<Watt, Watt> CalculateMaxCoolingPower(IVehicleDeclarationInputData completedVehicle, IVehicleDeclarationInputData primaryVehicle,
Mission mission)
{
var hvacConfiguration = completedVehicle.Components.BusAuxiliaries.HVACAux.SystemConfiguration;
-
- var length = DeclarationData.BusAuxiliaries.CalculateInternalLength(
+ var correctionLengthDrivetrainVolume = DeclarationData.BusAuxiliaries.CorrectionLengthDrivetrainVolume(
+ completedVehicle.VehicleCode, completedVehicle.LowEntry, primaryVehicle.AxleConfiguration.NumAxles(),
+ primaryVehicle.Articulated);
+
+ var pasengerCompartmentLength = DeclarationData.BusAuxiliaries.CalculateInternalLength(
completedVehicle.Length , completedVehicle.VehicleCode,
- completedVehicle.NumberOfPassengersLowerDeck);
- var height = DeclarationData.BusAuxiliaries.CalculateInternalHeight(completedVehicle.VehicleCode, completedVehicle.Height);
- var volume = length * height * completedVehicle.Width;
+ completedVehicle.NumberOfPassengersLowerDeck) - Constants.BusParameters.DriverCompartmentLength - correctionLengthDrivetrainVolume;
+
+ var internalHeight = DeclarationData.BusAuxiliaries.CalculateInternalHeight(completedVehicle.VehicleCode, completedVehicle.RegisteredClass, completedVehicle.Height);
+ var volume = pasengerCompartmentLength * internalHeight * completedVehicle.Width;
var driver = DeclarationData.BusAuxiliaries.HVACMaxCoolingPower.DriverMaxCoolingPower(
hvacConfiguration, mission.MissionType);
@@ -330,7 +352,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
return loading == LoadingType.ReferenceLoad
? VectoMath.Min(passengerCountRef, registeredPassengers)
- : passengerCountRef * mission.MissionType.GetLowLoadFactorBus();
+ : VectoMath.Min(passengerCountRef * mission.MissionType.GetLowLoadFactorBus(), registeredPassengers);
}
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs
index ad63ae01d290fa654ce21ef2927c9429173b1c5e..9b924cdab1ea0b60e6b9b2f60bd47c54ba2da9ff 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterHeavyLorry.cs
@@ -369,7 +369,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
: inputData.VehicleCategory;
for (uint i = 0; i < gearsInput.Count; i++) {
var gear = gearsInput[(int)i];
- var lossMap = CreateGearLossMap(gear, i, false, vehicleCategory);
+ var lossMap = CreateGearLossMap(gear, i, false, vehicleCategory, gearbox.Type);
var shiftPolygon = shiftPolygonCalc != null
? shiftPolygonCalc.ComputeDeclarationShiftPolygon(
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
index bba6f4bb14038e6a97ea9a6c567176b9364ffed2..a706bf7a27194ab88e100a4924d1452161ea5c26 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterPrimaryBus.cs
@@ -35,6 +35,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
{
var retVal = base.CreateVehicleData(data, segment, mission, loading);
retVal.CurbMass = mission.CurbMass;
+ retVal.GrossVehicleMass = 40000.SI<Kilogram>();
return retVal;
}
@@ -296,26 +297,28 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
{
var busParams = mission.BusParameter;
- var hvacBusLength = busParams.HVACConfiguration == BusHVACSystemConfiguration.Configuration2
- ? 2 * Constants.BusParameters.DriverCompartmentLength
- : busParams.VehicleLength;
- var hvacBusheight = DeclarationData.BusAuxiliaries.CalculateInternalHeight(mission.BusParameter.VehicleCode, busParams.BodyHeight);
- var coolingPower = CalculateMaxCoolingPower(null, mission);
+ var isDoubleDecker = busParams.VehicleCode.IsDoubleDeckerBus();
+ var internalLength = busParams.HVACConfiguration == BusHVACSystemConfiguration.Configuration2
+ ? 2 * Constants.BusParameters.DriverCompartmentLength // OK
+ : DeclarationData.BusAuxiliaries.CalculateInternalLength(busParams.VehicleLength,
+ busParams.VehicleCode, 10); // missing: correction length for low floor buses
+ var internalHeight = DeclarationData.BusAuxiliaries.CalculateInternalHeight(mission.BusParameter.VehicleCode, RegistrationClass.II, busParams.BodyHeight);
+ var coolingPower = CalculateMaxCoolingPower(null, null, mission);
var retVal = GetDefaulSSMInputs(heatingFuel);
retVal.BusFloorType = busParams.VehicleCode.GetFloorType();
retVal.Technologies = GetSSMTechnologyBenefits(busAuxInputData, mission.BusParameter.VehicleCode.GetFloorType());
retVal.FuelFiredHeaterPower = busParams.HVACAuxHeaterPower;
- retVal.BusWindowSurface = DeclarationData.BusAuxiliaries.WindowHeight(busParams.DoubleDecker) * hvacBusLength +
+ retVal.BusWindowSurface = DeclarationData.BusAuxiliaries.WindowHeight(busParams.DoubleDecker) * internalLength +
DeclarationData.BusAuxiliaries.FrontAndRearWindowArea(busParams.DoubleDecker);
- retVal.BusSurfaceArea = 2 * (hvacBusLength * busParams.VehicleWidth + hvacBusLength * busParams.BodyHeight +
- busParams.VehicleWidth * busParams.BodyHeight);
- retVal.BusVolume = hvacBusLength * busParams.VehicleWidth * hvacBusheight;
+ retVal.BusSurfaceArea = 2 * (internalLength * busParams.VehicleWidth + internalLength * internalHeight +
+ (isDoubleDecker ? 2.0 : 1.0) * busParams.VehicleWidth * busParams.BodyHeight);
+ retVal.BusVolume = internalLength * busParams.VehicleWidth * internalHeight;
retVal.UValue = DeclarationData.BusAuxiliaries.UValue(busParams.VehicleCode.GetFloorType());
retVal.NumberOfPassengers =
- DeclarationData.BusAuxiliaries.CalculateBusFloorSurfaceArea(hvacBusLength, busParams.VehicleWidth) *
+ DeclarationData.BusAuxiliaries.CalculateBusFloorSurfaceArea(internalLength, busParams.VehicleWidth) *
busParams.PassengerDensity *
(loadingType == LoadingType.LowLoading ? mission.MissionType.GetLowLoadFactorBus() : 1.0) + 1; // add driver for 'heat input'
retVal.VentilationRate = DeclarationData.BusAuxiliaries.VentilationRate(busParams.HVACConfiguration, false);
@@ -387,14 +390,14 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
}
- protected virtual Tuple<Watt, Watt> CalculateMaxCoolingPower(IVehicleDeclarationInputData vehicleData, Mission mission)
+ protected virtual Tuple<Watt, Watt> CalculateMaxCoolingPower(IVehicleDeclarationInputData vehicleData, IVehicleDeclarationInputData primaryVehicle, Mission mission)
{
var busParams = mission.BusParameter;
var length = DeclarationData.BusAuxiliaries.CalculateInternalLength(
busParams.VehicleLength, busParams.VehicleCode,
busParams.NumberPassengersLowerDeck);
- var height = DeclarationData.BusAuxiliaries.CalculateInternalHeight(busParams.VehicleCode, busParams.BodyHeight);
+ var height = DeclarationData.BusAuxiliaries.CalculateInternalHeight(busParams.VehicleCode, RegistrationClass.II, busParams.BodyHeight);
var volume = length * height * busParams.VehicleWidth;
var driver = DeclarationData.BusAuxiliaries.HVACMaxCoolingPower.DriverMaxCoolingPower(
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs
index 1da8215e0fe15fedee78c87d74d9f3803d5178f2..84f9ca2546b25934774a854ccd5f9d41e55464c8 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterSingleBus.cs
@@ -50,8 +50,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
#endregion
- protected override TransmissionLossMap CreateGearLossMap(
- ITransmissionInputData gear, uint i, bool useEfficiencyFallback, VehicleCategory vehicleCategory)
+ protected override TransmissionLossMap CreateGearLossMap(ITransmissionInputData gear, uint i, bool useEfficiencyFallback, VehicleCategory vehicleCategory, GearboxType gearboxType)
{
return TransmissionLossMapReader.Create(gear.LossMap, gear.Ratio, string.Format("Gear {0}", i + 1), true);
}
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
index dcf1454b3b8ba4b8efb4d28eb76a429bfb8a66b7..d18f0eb065402f0429ee0468ed742026faccb62a 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/EngineeringDataAdapter.cs
@@ -318,7 +318,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
}
for (uint i = 0; i < gearbox.Gears.Count; i++) {
var gear = gearbox.Gears[(int)i];
- var lossMap = CreateGearLossMap(gear, i, true, VehicleCategory.Unknown);
+ var lossMap = CreateGearLossMap(gear, i, true, VehicleCategory.Unknown, gearbox.Type);
var shiftPolygon = gear.ShiftPolygon != null && gear.ShiftPolygon.SourceType != DataSourceType.Missing
? ShiftPolygonReader.Create(gear.ShiftPolygon)
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
index 4c2775795b512289cabe425c0e2d660024f433af..58ca92d5209a7fad7998e209be701d092395c788 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedBusVectoRunDataFactory.cs
@@ -205,8 +205,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
protected virtual Segment GetPrimarySegment(IVehicleDeclarationInputData primaryVehicle)
{
var primarySegment = DeclarationData.PrimaryBusSegments.Lookup(
- primaryVehicle.VehicleCategory, primaryVehicle.AxleConfiguration, primaryVehicle.Articulated,
- primaryVehicle.FloorType);
+ primaryVehicle.VehicleCategory, primaryVehicle.AxleConfiguration, primaryVehicle.Articulated);
return primarySegment;
}
@@ -221,13 +220,13 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
var segment = DeclarationData.CompletedBusSegments.Lookup(
axleConfiguration.NumAxles(), vehicle.VehicleCode, vehicle.RegisteredClass, vehicle.NumberOfPassengersLowerDeck,
- vehicle.Height, vehicle.FloorType == FloorType.LowFloor);
+ vehicle.Height, vehicle.LowEntry);
if (!segment.Found) {
throw new VectoException(
- "no segment found for vehicle configruation: vehicle category: {0}, axle configuration: {1}, articulated: {2}, vehicle code: {3}, registered class: {4}, passengersLowerDeck: {5}, height: {6}, lowfloor: {7}. completed",
+ "no segment found for vehicle configruation: vehicle category: {0}, axle configuration: {1}, articulated: {2}, vehicle code: {3}, registered class: {4}, passengersLowerDeck: {5}, height: {6}, lowEntry: {7}. completed",
vehicle.VehicleCategory, axleConfiguration,
vehicle.Articulated, vehicle.VehicleCode, vehicle.RegisteredClass.GetLabel(), vehicle.NumberOfPassengersLowerDeck,
- vehicle.Height, vehicle.FloorType == FloorType.LowFloor);
+ vehicle.Height, vehicle.LowEntry);
}
return segment;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
index d54349d83090b562baabac923ac39d125c851858..a5bc6550255ca0eb790a4e2b2a5f6d6162231a53 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModePrimaryBusVectoRunDataFactory.cs
@@ -46,7 +46,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
}
var segment = DeclarationData.PrimaryBusSegments.Lookup(
- vehicle.VehicleCategory, vehicle.AxleConfiguration, vehicle.Articulated, vehicle.FloorType);
+ vehicle.VehicleCategory, vehicle.AxleConfiguration, vehicle.Articulated);
if (!segment.Found) {
throw new VectoException(
"no segment found for vehicle configruation: vehicle category: {0}, axle configuration: {1}, articulated: {2}, primary",
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
index 689c7aea985f22cf39093fdedf5733036604499d..eef38240de127394b6efd93eb0832c5787588750 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeSingleBusVectoRunDataFactory.cs
@@ -42,13 +42,13 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl {
var segment = DeclarationData.CompletedBusSegments.Lookup(
_singleBusInputData.PrimaryVehicle.AxleConfiguration.NumAxles(), completedVehicle.VehicleCode, completedVehicle.RegisteredClass, completedVehicle.NumberOfPassengersLowerDeck,
- completedVehicle.Height, completedVehicle.FloorType == FloorType.LowFloor);
+ completedVehicle.Height, completedVehicle.LowEntry);
if (!segment.Found) {
throw new VectoException(
"no segment found for vehicle configruation: vehicle category: {0}, axle configuration: {1}, articulated: {2}, vehicle code: {3}, registered class: {4}, passengersLowerDeck: {5}, height: {6}, lowfloor: {7}. completed",
vehicle.VehicleCategory, _singleBusInputData.PrimaryVehicle.AxleConfiguration,
vehicle.Articulated, completedVehicle.VehicleCode, completedVehicle.RegisteredClass.GetLabel(), completedVehicle.NumberOfPassengersLowerDeck,
- completedVehicle.Height, completedVehicle.FloorType == FloorType.LowFloor);
+ completedVehicle.Height, completedVehicle.LowEntry);
}
foreach (var mission in segment.Missions) {
mission.VehicleHeight = completedVehicle.Height + mission.BusParameter.DeltaHeight;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryHeavyBusPrimary.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryHeavyBusPrimary.cs
index ab449f18b3d21b38e938dc29a99e1736247c1873..7e031ba8978a87b14815a99ed4b7d7ee6f956e7c 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryHeavyBusPrimary.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactoryHeavyBusPrimary.cs
@@ -44,7 +44,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl {
{
var vehicle = JobInputData.Vehicle;
Segment = DeclarationData.PrimaryBusSegments.Lookup(
- vehicle.VehicleCategory, vehicle.AxleConfiguration, vehicle.Articulated, vehicle.FloorType);
+ vehicle.VehicleCategory, vehicle.AxleConfiguration, vehicle.Articulated);
Driverdata = Dao.CreateDriverData();
Driverdata.AccelerationCurve = AccelerationCurveReader.ReadFromStream(Segment.AccelerationFile);
@@ -185,7 +185,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl {
protected override AuxFanData GetFanData()
{
return new AuxFanData() {
- FanCoefficients = DeclarationData.VTPMode.FanParameters,
+ FanCoefficients = DeclarationData.VTPMode.FanParameters.Concat(JobInputData.FanPowerCoefficents.Skip(3).Take(1)).ToArray() ,
FanDiameter = JobInputData.FanDiameter,
};
}
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringVTPModeVectoRunDataFactoryHeavyBusPrimary.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringVTPModeVectoRunDataFactoryHeavyBusPrimary.cs
index 5719f2df4b9482edd6ddef330061d10042427c44..5c4daa42cec6ad65015203899dd7e146dfc200de 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringVTPModeVectoRunDataFactoryHeavyBusPrimary.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringVTPModeVectoRunDataFactoryHeavyBusPrimary.cs
@@ -5,13 +5,18 @@ using TUGraz.VectoCommon.InputData;
using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
+using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
using TUGraz.VectoCore.OutputData;
namespace TUGraz.VectoCore.InputData.Reader.Impl {
internal class EngineeringVTPModeVectoRunDataFactoryHeavyBusPrimary : DeclarationVTPModeVectoRunDataFactoryHeavyBusPrimary
{
- public EngineeringVTPModeVectoRunDataFactoryHeavyBusPrimary(IVTPEngineeringInputDataProvider ivtpProvider) : base(ivtpProvider.JobInputData, null) { }
+ public EngineeringVTPModeVectoRunDataFactoryHeavyBusPrimary(IVTPEngineeringInputDataProvider ivtpProvider) : base(
+ ivtpProvider.JobInputData, null)
+ {
+ throw new Exception("VTP Simulation in engineering mode for heavy buses not supported");
+ }
public override IEnumerable<VectoRunData> NextRun()
{
@@ -28,6 +33,9 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl {
runData.FanDataVTP = GetFanData();
runData.ExecutionMode = ExecutionMode.Engineering;
runData.SimulationType = SimulationType.VerificationTest;
+ runData.Mission = new Mission() {
+ MissionType = MissionType.VerificationTest
+ };
return runData;
});
}
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringVTPModeVectoRunDataFactoryLorries.cs b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringVTPModeVectoRunDataFactoryLorries.cs
index 4e91242e92e1b72da0237497907981daf719ebae..72565f51413f2671518e0b857df7d044169ff575 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringVTPModeVectoRunDataFactoryLorries.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/EngineeringVTPModeVectoRunDataFactoryLorries.cs
@@ -37,6 +37,7 @@ using TUGraz.VectoCommon.Models;
using TUGraz.VectoCommon.Utils;
using TUGraz.VectoCore.InputData.Reader.ComponentData;
using TUGraz.VectoCore.InputData.Reader.DataObjectAdapter;
+using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.Data;
namespace TUGraz.VectoCore.InputData.Reader.Impl
@@ -66,6 +67,9 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
runData.FanDataVTP = GetFanData();
runData.ExecutionMode = ExecutionMode.Engineering;
runData.SimulationType = SimulationType.VerificationTest;
+ runData.Mission = new Mission() {
+ MissionType = MissionType.VerificationTest
+ };
return runData;
});
}
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index 3d254a2459390208a64a1d286fb23a60de3cb2cd..15ea2fb2188b961a089fb70a1cc0d893972b1e02 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -256,6 +256,7 @@ namespace TUGraz.VectoCore.Models.Declaration
case BusHVACSystemConfiguration.Configuration7:
case BusHVACSystemConfiguration.Configuration8:
case BusHVACSystemConfiguration.Configuration9:
+ case BusHVACSystemConfiguration.Configuration10:
return heating
? Constants.BusAuxiliaries.SteadyStateModel.HighVentilationHeating
: Constants.BusAuxiliaries.SteadyStateModel.HighVentilation;
@@ -299,7 +300,7 @@ namespace TUGraz.VectoCore.Models.Declaration
return CalculateInternalLength(vehicleLength, vehicleCode, numPassLowFloor);
}
- public static Meter CalculateInternalHeight(VehicleCode vehicleCode, Meter vehicleHeight)
+ public static Meter CalculateInternalHeight(VehicleCode vehicleCode, RegistrationClass registrationClass, Meter bodyHeight)
{
if (vehicleCode.IsDoubleDeckerBus()) {
return Constants.BusParameters.InternalHeightDoubleDecker;
@@ -307,11 +308,15 @@ namespace TUGraz.VectoCore.Models.Declaration
switch (vehicleCode.GetFloorType()) {
case FloorType.LowFloor:
- return vehicleHeight;
+ return bodyHeight;
case FloorType.HighFloor:
- return vehicleHeight - Constants.BusParameters.HeightLuggageCompartment;
+ if ((registrationClass == RegistrationClass.II_III && bodyHeight > 3.1.SI<Meter>()) ||
+ registrationClass == RegistrationClass.III || registrationClass == RegistrationClass.B) {
+ return Constants.BusParameters.InternalHeightDoubleDecker;
+ }
+ return bodyHeight - Constants.BusParameters.HeightLuggageCompartment;
}
-
+
throw new VectoException("Internal height for vehicle floor type '{0}' {1} not defined", vehicleCode.GetFloorType().ToString(), vehicleCode.IsDoubleDeckerBus() ? "double decker" : "single decker");
}
@@ -353,6 +358,19 @@ namespace TUGraz.VectoCore.Models.Declaration
return (coolingPwrDriver * comprTypeDriver.COP(floorType) + coolingPwrPass * comprTypePass.COP(floorType)) /
(coolingPwrDriver + coolingPwrPass);
}
+
+ public static Meter CorrectionLengthDrivetrainVolume(VehicleCode vehicleCode, bool lowEntry, int numAxles, bool articulated)
+ {
+ if ((vehicleCode == VehicleCode.CE || vehicleCode == VehicleCode.CG) && !lowEntry) {
+ switch (numAxles) {
+ case 2: return 1.0.SI<Meter>();
+ case 3: return articulated ? 1.0.SI<Meter>() : 1.25.SI<Meter>();
+ case 4: return 1.25.SI<Meter>();
+ default: throw new VectoException("invalid number of axles {0}", numAxles);
+ }
+ }
+ return 0.SI<Meter>();
+ }
}
public static class Driver
diff --git a/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs b/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
index 4976f6e0c80af209b67005c9ae18af24b1b1abb0..eb45fecc191d40ad509b9c24c84cdf65fcdc81e7 100644
--- a/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/PrimaryBusSegments.cs
@@ -10,7 +10,7 @@ using TUGraz.VectoCore.Utils;
namespace TUGraz.VectoCore.Models.Declaration
{
- public sealed class PrimaryBusSegments : LookupData<VehicleCategory, AxleConfiguration, bool, FloorType, Segment>
+ public sealed class PrimaryBusSegments : LookupData<VehicleCategory, AxleConfiguration, bool, Segment>
{
private DataTable _segmentTable;
@@ -36,7 +36,7 @@ namespace TUGraz.VectoCore.Models.Declaration
}
public override Segment Lookup(
- VehicleCategory vehicleCategory, AxleConfiguration axleConfiguration, bool articulated, FloorType entrance)
+ VehicleCategory vehicleCategory, AxleConfiguration axleConfiguration, bool articulated)
{
return LookupPrimaryVehicle(vehicleCategory, axleConfiguration, articulated);
}
diff --git a/VectoCore/VectoCore/Models/Declaration/SteeringPumpBus.cs b/VectoCore/VectoCore/Models/Declaration/SteeringPumpBus.cs
index abd714d99c18d8ceaa3719ac9c50920a51632df0..3da8514f463b0d72f7aa1078a615baa8582ed602 100644
--- a/VectoCore/VectoCore/Models/Declaration/SteeringPumpBus.cs
+++ b/VectoCore/VectoCore/Models/Declaration/SteeringPumpBus.cs
@@ -37,7 +37,7 @@ namespace TUGraz.VectoCore.Models.Declaration {
var powerDemandTubing = (Constants.BusParameters.Auxiliaries.SteeringPump.TubingLoss * 2 *
(vehicleLength - Constants.BusParameters.Auxiliaries.SteeringPump.LengthBonus) *
Constants.BusParameters.Auxiliaries.SteeringPump.VolumeFlow).Cast<Watt>();
- var tubingFactor = techLookup.TubingFactor;
+ var tubingFactor = i == 0 ? techLookup.TubingFactor : 0;
var axleFactor = techLookup.AxleFactor;
powerDemand += baseDemand * axleFactor + powerDemandTubing * tubingFactor;
diff --git a/VectoCore/VectoCore/Models/GenericModelData/GenericBusEngineData.cs b/VectoCore/VectoCore/Models/GenericModelData/GenericBusEngineData.cs
index 903d2f097b2da186ce1c7aa0290e11ac98f8ef13..a0aace79fc3973dda4d06afbddb318bd71b69fea 100644
--- a/VectoCore/VectoCore/Models/GenericModelData/GenericBusEngineData.cs
+++ b/VectoCore/VectoCore/Models/GenericModelData/GenericBusEngineData.cs
@@ -78,9 +78,10 @@ namespace TUGraz.VectoCore.Models.Declaration
}
engine.FullLoadCurves = fullLoadCurves;
-
- var fuel = GetCombustionEngineFuelData(primaryVehicle.Components.EngineInputData.EngineModes[modeIdx], fullLoadCurves[0], mission);
+ var engineMode = primaryVehicle.Components.EngineInputData.EngineModes[modeIdx];
+ var fuel = GetCombustionEngineFuelData(engineMode.Fuels,
+ VectoMath.Max(engineMode.IdleSpeed, primaryVehicle.EngineIdleSpeed), fullLoadCurves[0], mission);
@@ -91,10 +92,10 @@ namespace TUGraz.VectoCore.Models.Declaration
}
- private bool UseDieselFuel(IEngineModeDeclarationInputData engineMode)
+ private bool UseDieselFuel(IList<IEngineFuelDelcarationInputData> fuels)
{
- var fuelType = engineMode.Fuels.First().FuelType;
- var isDualFuel = engineMode.Fuels.Count > 1;
+ var fuelType = fuels.First().FuelType;
+ var isDualFuel = fuels.Count > 1;
if (isDualFuel)
return true;
@@ -109,32 +110,28 @@ namespace TUGraz.VectoCore.Models.Declaration
}
}
- private string GetEngineRessourceId(IEngineModeDeclarationInputData engineMode)
+ private string GetEngineRessourceId(IList<IEngineFuelDelcarationInputData> fuels)
{
- return UseDieselFuel(engineMode) ? GenericEngineCM_Normed_CI : GenericEngineCM_Normed_PI;
+ return UseDieselFuel(fuels) ? GenericEngineCM_Normed_CI : GenericEngineCM_Normed_PI;
}
- private IFuelProperties GetFuelData(IEngineModeDeclarationInputData engineMode)
+ private IFuelProperties GetFuelData(IList<IEngineFuelDelcarationInputData> fuels)
{
- return UseDieselFuel(engineMode)
+ return UseDieselFuel(fuels)
? FuelData.Diesel
: FuelData.Instance().Lookup(FuelType.NGPI, TankSystem.Compressed);
}
- private double[] GetEngineCorrectionFactors(IEngineModeDeclarationInputData engineMode)
+ private double[] GetEngineCorrectionFactors(IList<IEngineFuelDelcarationInputData> fuels)
{
- return UseDieselFuel(engineMode) ? DieselCIFactors : PIFactors;
+ return UseDieselFuel(fuels) ? DieselCIFactors : PIFactors;
}
- private CombustionEngineFuelData GetCombustionEngineFuelData(IEngineModeDeclarationInputData engineMode, EngineFullLoadCurve fullLoadCurve, Mission mission)
+ private CombustionEngineFuelData GetCombustionEngineFuelData(IList<IEngineFuelDelcarationInputData> fuels, PerSecond idleSpeed, EngineFullLoadCurve fullLoadCurve, Mission mission)
{
- var ressourceId = GetEngineRessourceId(engineMode);
+ var ressourceId = GetEngineRessourceId(fuels);
- var nIdle = engineMode.IdleSpeed.AsRPM;
- var ratedSpeed = fullLoadCurve.RatedSpeed.AsRPM;
- var maxTorque = fullLoadCurve.MaxTorque.Value();
-
- var denormalizedData = DenormalizeData(ressourceId, nIdle, ratedSpeed, maxTorque);
+ var denormalizedData = DenormalizeData(ressourceId, idleSpeed, fullLoadCurve.N95hSpeed, fullLoadCurve.MaxPower);
var engineSpeed = denormalizedData.AsEnumerable().Select(r =>
r.Field<string>(FuelConsumptionMapReader.Fields.EngineSpeed).ToDouble()).ToArray();
@@ -158,7 +155,7 @@ namespace TUGraz.VectoCore.Models.Declaration
;
var fcMap = FuelConsumptionMapReader.Create(denormalizedData.AsEnumerable().OrderBy(r => r.Field<string>(FuelConsumptionMapReader.Fields.EngineSpeed).ToDouble())
.ThenBy(r => r.Field<string>(FuelConsumptionMapReader.Fields.Torque).ToDouble()).CopyToDataTable());
- var engineCF = GetEngineCorrectionFactors(engineMode);
+ var engineCF = GetEngineCorrectionFactors(fuels);
var fuel = new CombustionEngineFuelData
{
@@ -168,7 +165,7 @@ namespace TUGraz.VectoCore.Models.Declaration
ColdHotCorrectionFactor = engineCF[3],
CorrectionFactorRegPer = engineCF[4],
ConsumptionMap = fcMap,
- FuelData = GetFuelData(engineMode)
+ FuelData = GetFuelData(fuels)
};
fuel.FuelConsumptionCorrectionFactor = DeclarationData.WHTCCorrection.Lookup(
mission.MissionType.GetNonEMSMissionType(), fuel.WHTCRural, fuel.WHTCUrban,
@@ -180,7 +177,7 @@ namespace TUGraz.VectoCore.Models.Declaration
- private DataTable DenormalizeData(string ressourceId, double nIdle, double ratedSpeed, double maxTorque)
+ private DataTable DenormalizeData(string ressourceId, PerSecond nIdle, PerSecond n95h, Watt ratedPower)
{
var normalized = VectoCSVFile.ReadStream(RessourceHelper.ReadStream(ressourceId), source: ressourceId);
@@ -190,38 +187,20 @@ namespace TUGraz.VectoCore.Models.Declaration
result.Columns.Add(FuelConsumptionMapReader.Fields.FuelConsumption);
foreach (DataRow row in normalized.Rows) {
- var engineSpeed = DenormalizeEngineSpeed((string)row[FuelConsumptionMapReader.Fields.EngineSpeed],
- nIdle, ratedSpeed);
- var torque = DenormalizeTorque((string)row[FuelConsumptionMapReader.Fields.Torque], maxTorque);
- var fc = DenormalizeFC((string)row[FuelConsumptionMapReader.Fields.FuelConsumption], maxTorque);
+ var engineSpeed = row.ParseDouble("n_norm") * (n95h - nIdle) + nIdle;
+ var pwr = row.ParseDouble("P_norm") * ratedPower;
+ var torque = pwr / engineSpeed;
+ var fc = (row.ParseDouble("FC_norm") * ratedPower.Value() / 1000).SI(Unit.SI.Gramm.Per.Hour) .Cast<KilogramPerSecond>();
var newRow = result.NewRow();
- newRow[FuelConsumptionMapReader.Fields.EngineSpeed] = Math.Round(engineSpeed,2, MidpointRounding.AwayFromZero);
- newRow[FuelConsumptionMapReader.Fields.Torque] = Math.Round(torque, 2, MidpointRounding.AwayFromZero);
- newRow[FuelConsumptionMapReader.Fields.FuelConsumption] = Math.Round(fc, 2, MidpointRounding.AwayFromZero);
+ newRow[FuelConsumptionMapReader.Fields.EngineSpeed] = Math.Round(engineSpeed.AsRPM,2, MidpointRounding.AwayFromZero);
+ newRow[FuelConsumptionMapReader.Fields.Torque] = Math.Round(torque.Value(), 2, MidpointRounding.AwayFromZero);
+ newRow[FuelConsumptionMapReader.Fields.FuelConsumption] = Math.Round(fc.ConvertToGrammPerHour().Value, 2, MidpointRounding.AwayFromZero);
result.Rows.Add(newRow);
}
return result;
}
- [MethodImpl(MethodImplOptions.AggressiveInlining)]
- private double DenormalizeFC(string fc, double mRated)
- {
- return fc.ToDouble() * mRated;
- }
-
- [MethodImpl(MethodImplOptions.AggressiveInlining)]
- private double DenormalizeTorque(string torque, double mRated)
- {
- return torque.ToDouble() * mRated;
- }
-
- [MethodImpl(MethodImplOptions.AggressiveInlining)]
- private double DenormalizeEngineSpeed(string engineSpeed, double nIdle, double nRated)
- {
- return engineSpeed.ToDouble() * (nRated - nIdle) + nIdle;
- }
-
}
}
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index 636240c37d84ff427cef54c4aa106bcc01df5703..ee901cf465a993bc8e51f3f1adbf9f5ed45096bf 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -213,7 +213,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
private void AddVTPTruckAuxiliaries(VectoRunData data, VehicleContainer container, VTPCombustionEngine engine)
{
var aux = CreateSpeedDependentAuxiliaries(data, container);
- var engineFan = new EngineFanAuxiliary(data.FanDataVTP.FanCoefficients, data.FanDataVTP.FanDiameter);
+ var engineFan = new EngineFanAuxiliary(data.FanDataVTP.FanCoefficients.Take(3).ToArray(), data.FanDataVTP.FanDiameter);
aux.AddCycle(Constants.Auxiliaries.IDs.Fan, cycleEntry => engineFan.PowerDemand(cycleEntry.FanSpeed));
container.ModalData.AddAuxiliary(Constants.Auxiliaries.IDs.Fan);
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
index 6ccde6852042fc9cf1407fb5f992282b75249059..5e7da76f54c3e47f7b85f6fde74676deef5f7c5b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/BusAuxiliariesAdapter.cs
@@ -184,7 +184,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
// cycleStep has to be called here and not in DoCommit, write is called before Commit!
var oldSOC = Auxiliaries.BatterySOC;
- Auxiliaries.CycleStep(CurrentState.dt, EngineStopStartUtilityFactor);
+ Auxiliaries.CycleStep(CurrentState.dt, DataBus.IgnitionOn ? 1.0 : EngineStopStartUtilityFactor);
var newSOC = Auxiliaries.BatterySOC;
//CurrentState.TotalFuelConsumption = Auxiliaries.TotalFuel;
@@ -197,15 +197,15 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
container[ModalResultField.P_busAux_ES_generated] = essUtilityFactor * Auxiliaries.ElectricPowerGenerated;
if (SmartElectricSystem) {
- container[ModalResultField.BatterySOC] = Auxiliaries.BatterySOC * 100.0;
-
+ var batteryPwr = (oldSOC - newSOC) * AuxCfg.ElectricalUserInputsConfig.ElectricStorageCapacity / dt;
- container[ModalResultField.P_busAux_ES_generated] = essUtilityFactor * (DataBus.VehicleStopped ? Auxiliaries.ElectricPowerConsumerSum : Auxiliaries.ElectricPowerGenerated);
- container[ModalResultField.P_busAux_ES_sum_mech] = essUtilityFactor * Auxiliaries.ElectricPowerConsumerSum /
+ container[ModalResultField.BatterySOC] = Auxiliaries.BatterySOC * 100.0;
+
+ container[ModalResultField.P_busAux_ES_generated] = essUtilityFactor * (DataBus.VehicleStopped && !DataBus.IgnitionOn ? Auxiliaries.ElectricPowerConsumerSum : Auxiliaries.ElectricPowerGenerated);
+ container[ModalResultField.P_busAux_ES_sum_mech] = essUtilityFactor * (Auxiliaries.ElectricPowerConsumerSum - batteryPwr) /
AuxCfg.ElectricalUserInputsConfig.AlternatorGearEfficiency /
AuxCfg.ElectricalUserInputsConfig.AlternatorMap.GetEfficiency(0.RPMtoRad(), 0.SI<Ampere>());
- var batteryPwr = (oldSOC - newSOC) * AuxCfg.ElectricalUserInputsConfig.ElectricStorageCapacity / dt;
if (batteryPwr.IsSmaller(Auxiliaries.ElectricPowerConsumerSum * EngineStopStartUtilityFactor)) {
// add to P_aux_ES
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
index 3ea854218a4380cf020e7a667b231227cac22e82..7f44e2ec0e6faedc7835c85c2e0dc4516139ead0 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs
@@ -332,9 +332,11 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
protected virtual PerSecond GetEngineSpeedLimit(Second absTime)
{
- return DataBus.Gear == 0 || !DataBus.ClutchClosed(absTime)
- ? ModelData.FullLoadCurves[0].N95hSpeed
- : VectoMath.Min(DataBus.GetGearData(DataBus.Gear).MaxSpeed, ModelData.FullLoadCurves[0].N95hSpeed);
+ if (DataBus.Gear == 0 || !DataBus.ClutchClosed(absTime) || !DataBus.TCLocked) {
+ return ModelData.FullLoadCurves[0].N95hSpeed;
+ }
+
+ return VectoMath.Min(DataBus.GetGearData(DataBus.Gear).MaxSpeed, ModelData.FullLoadCurves[0].N95hSpeed);
}
public virtual IResponse Initialize(NewtonMeter outTorque, PerSecond outAngularVelocity)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
index d8d24b3db41e21a869a162d225a2fc6bb1c0c21a..4956e219e1923c52518bceff42e178df5ae2f934 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/Driver.cs
@@ -541,6 +541,22 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
}
}
+ // try again without changing the engine speed to 'spare' inertia torque
+ engineSpeed = DataBus.EngineSpeed;
+ tcOp = EstimateTCOpPoint(operatingPoint, dryRunResp, engineSpeed, tc);
+
+ if (tcOp.Item1.Item2.IsBetween(tcOp.Item2, tcOp.Item3)) {
+ if (!dryRunResp.TorqueConverterOperatingPoint.OutTorque.IsEqual(tcOp.Item1.Item1.OutTorque)) {
+ tc.SetOperatingPoint = tcOp.Item1.Item1;
+ }
+ try {
+ var acceleration = SearchAccelerationFixedTC(absTime, gradient, operatingPoint, tcOp.Item1, dryRunResp);
+ return ComputeTimeInterval(acceleration, operatingPoint.SimulationDistance);
+ } catch (Exception e) {
+ Log.Error(e, "Failed to find acceleration for tc operating point! absTime: {0}", absTime);
+ throw;
+ }
+ }
// Attempt 2: search for an input speed (ICE speed) so that a valid operating point for
// the torque converter and the engine are found. Estimate max torque, drag torque. calculate delta
@@ -560,7 +576,17 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
});
} catch (Exception e) {
Log.Error(e, "Failed to find engine speed for valid torque converter operating point! absTime: {0}", absTime);
- throw;
+
+ // if no engine speed can be found that results in an operating point on the TC curve, set the TC in-torque to the maximum
+ // available from the engine. reverse-calc TC-in-torque from average engine torque
+ var tcInPwrPrev = (DataBus.EngineSpeed + tcOp.Item1.Item1.InAngularVelocity) * tcOp.Item1.Item2 -
+ (tcOp.Item1.Item1.InAngularVelocity * tcOp.Item1.Item1.InTorque);
+ tcOp.Item1.Item1.InTorque = (2 * tcOp.Item3 * tcOp.Item1.Item1.InAngularVelocity - tcInPwrPrev) /
+ tcOp.Item1.Item1.InAngularVelocity;
+ tc.SetOperatingPoint = tcOp.Item1.Item1;
+ var acceleration = SearchAccelerationFixedTC(absTime, gradient, operatingPoint, tcOp.Item1, dryRunResp);
+
+ return ComputeTimeInterval(acceleration, operatingPoint.SimulationDistance);
}
// a suitable engine sped was found - search acceleration to match TC out-torque
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineFanAuxiliary.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineFanAuxiliary.cs
index fa31e327b5c3782d1cb7ee6db2bf587bf2f24c08..ecd274aa64477ff12ba53d88688c528cb6768a37 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineFanAuxiliary.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/EngineFanAuxiliary.cs
@@ -38,6 +38,8 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
{
protected readonly double[] FanCoefficients;
+ protected double ScalingFactor = 1.0;
+
protected readonly double FanDiameter;
public EngineFanAuxiliary(double[] fanParameters, Meter fanDiameter)
@@ -45,6 +47,10 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
if (fanParameters.Length < 3) {
throw new ArgumentException("Three fan parameters are required!");
}
+
+ if (fanParameters.Length > 3) {
+ ScalingFactor = fanParameters[3];
+ }
FanCoefficients = fanParameters;
FanDiameter = fanDiameter.ConvertToMilliMeter();
}
@@ -52,7 +58,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
public Watt PowerDemand(PerSecond fanSpeed)
{
- return (FanCoefficients[0] * Math.Pow(fanSpeed.AsRPM / FanCoefficients[1], 3) * Math.Pow(FanDiameter / FanCoefficients[2], 5) * 1000).SI<Watt>();
+ return ScalingFactor * (FanCoefficients[0] * Math.Pow(fanSpeed.AsRPM / FanCoefficients[1], 3) * Math.Pow(FanDiameter / FanCoefficients[2], 5) * 1000).SI<Watt>();
}
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
index 2ef6cc25beda86e4a363a09b5261b64afae7d7ff..9449c9c06081051d4410451768391f02df6f1ec3 100644
--- a/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/IModalDataContainer.cs
@@ -117,8 +117,9 @@ namespace TUGraz.VectoCore.OutputData
Func<Second, Joule, Joule> AuxHeaterDemandCalc { get; set; }
- KilogramPerWattSecond VehicleLineCorrectionFactor(IFuelProperties fuel);
+ KilogramPerWattSecond EngineLineCorrectionFactor(IFuelProperties fuel);
void CalculateAggregateValues();
+ KilogramPerWattSecond VehicleLineSlope(IFuelProperties fuel);
}
public static class ModalDataContainerExtensions
@@ -332,7 +333,13 @@ namespace TUGraz.VectoCore.OutputData
return data.WorkWheelsPos() / data.Duration;
}
+ public static Watt PowerWheel(this IModalDataContainer data)
+ {
+ return data.TimeIntegral<WattSecond>(ModalResultField.P_wheel_in) / data.Duration;
+ }
+
+
public static KilogramPerSecond FuelConsumptionPerSecond(this IModalDataContainer data, ModalResultField mrf, IFuelProperties fuelData)
{
return data.TimeIntegral<Kilogram>(data.GetColumnName(fuelData, mrf)) / data.Duration;
@@ -378,6 +385,11 @@ namespace TUGraz.VectoCore.OutputData
return data.TimeIntegral<WattSecond>(ModalResultField.P_busAux_PS_generated_alwaysOn);
}
+ public static WattSecond EnergyBusAuxESGeneratedMech(this IModalDataContainer data)
+ {
+ return data.TimeIntegral<WattSecond>(ModalResultField.P_busAux_ES_sum_mech);
+ }
+
public static WattSecond EnergyBusAuxESGenerated(this IModalDataContainer data)
{
return data.TimeIntegral<WattSecond>(ModalResultField.P_busAux_ES_generated);
@@ -403,9 +415,12 @@ namespace TUGraz.VectoCore.OutputData
public static Watt TotalPowerEnginePositiveAverage(this IModalDataContainer data)
{
- var simulationIntervals = data.GetValues<Second>(ModalResultField.simulationInterval);
- var values = data.GetValues<Watt>(ModalResultField.P_ice_fcmap)
- .Zip(simulationIntervals, (value, dt) => new { Dt = dt, Value = value * dt })
+ //var simulationIntervals = data.GetValues<Second>(ModalResultField.simulationInterval);
+ var values = data.GetValues(x => new {
+ Value = x.Field<Watt>(ModalResultField.P_ice_fcmap.GetName()).DefaultIfNull(0) * x.Field<Second>(ModalResultField.simulationInterval.GetName())
+ })
+ //.GetValues<Watt>(ModalResultField.P_ice_fcmap)
+ //.Zip(simulationIntervals, (value, dt) => new { Dt = dt, Value = value * dt })
.Where(v => v.Value > 0).ToList();
if (values.Any()) {
return values.Sum(v => v.Value) / data.Duration;
@@ -413,6 +428,20 @@ namespace TUGraz.VectoCore.OutputData
return 0.SI<Watt>();
}
+ public static Watt TotalPowerEngineAverage(this IModalDataContainer data)
+ {
+ var values = data.GetValues(
+ x => new {
+ Value = x.Field<Watt>(ModalResultField.P_ice_fcmap.GetName()).DefaultIfNull(0) *
+ x.Field<Second>(ModalResultField.simulationInterval.GetName())
+ }).ToList();
+ if (values.Any()) {
+ return values.Sum(v => v.Value) / data.Duration;
+ }
+
+ return 0.SI<Watt>();
+ }
+
public static MeterPerSecond Speed(this IModalDataContainer data)
{
var distance = data.Distance;
diff --git a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
index 49b67df69f16d253fcf2e14a086ab7eacdf305ce..bc003abc169db4b4d0515b72adb817bf8ba9bd15 100644
--- a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
@@ -67,7 +67,8 @@ namespace TUGraz.VectoCore.OutputData
};
private readonly Dictionary<String, SI> _timeIntegrals = new Dictionary<string, SI>();
- private readonly Dictionary<FuelType, KilogramPerWattSecond> _vehicleLine = new Dictionary<FuelType, KilogramPerWattSecond>();
+ private readonly Dictionary<FuelType, KilogramPerWattSecond> _engLine = new Dictionary<FuelType, KilogramPerWattSecond>();
+ private readonly Dictionary<FuelType, KilogramPerWattSecond> _vehLine = new Dictionary<FuelType, KilogramPerWattSecond>();
public int JobRunId { get; }
public string RunName { get; }
@@ -166,10 +167,10 @@ namespace TUGraz.VectoCore.OutputData
public Func<Second, Joule, Joule> AuxHeaterDemandCalc { get; set; }
- public KilogramPerWattSecond VehicleLineCorrectionFactor(IFuelProperties fuel)
+ public KilogramPerWattSecond EngineLineCorrectionFactor(IFuelProperties fuel)
{
- if (_vehicleLine.ContainsKey(fuel.FuelType)) {
- return _vehicleLine[fuel.FuelType];
+ if (_engLine.ContainsKey(fuel.FuelType)) {
+ return _engLine[fuel.FuelType];
}
double k, d, r;
@@ -181,9 +182,33 @@ namespace TUGraz.VectoCore.OutputData
x.Field<SI>(GetColumnName(fuel, ModalResultField.FCFinal)).Value())
: null).Where(x => x != null && x.Y > 0),
out k, out d, out r);
- _vehicleLine[fuel.FuelType] = k.SI<KilogramPerWattSecond>();
+ _engLine[fuel.FuelType] = k.SI<KilogramPerWattSecond>();
- return _vehicleLine[fuel.FuelType];
+ return _engLine[fuel.FuelType];
+ }
+
+ public KilogramPerWattSecond VehicleLineSlope(IFuelProperties fuel)
+ {
+ if (_vehLine.ContainsKey(fuel.FuelType)) {
+ return _vehLine[fuel.FuelType];
+ }
+
+ if (Data.AsEnumerable().Any(r => r.Field<SI>(ModalResultField.P_wheel_in.GetName()) != null)) {
+ double k, d, r;
+ VectoMath.LeastSquaresFitting(
+ GetValues(
+ row => row.Field<bool>(ModalResultField.ICEOn.GetName())
+ ? new Point(
+ row.Field<SI>(ModalResultField.P_wheel_in.GetName()).Value(),
+ row.Field<SI>(GetColumnName(fuel, ModalResultField.FCFinal)).Value())
+ : null)
+ .Where(x => x != null && x.X > 0 && x.Y > 0), out k, out d, out r);
+
+ _vehLine[fuel.FuelType] = k.SI<KilogramPerWattSecond>();
+ return _vehLine[fuel.FuelType];
+ }
+
+ return null;
}
public void CalculateAggregateValues()
@@ -195,7 +220,8 @@ namespace TUGraz.VectoCore.OutputData
}
foreach (var fuel in FuelColumns.Keys) {
- VehicleLineCorrectionFactor(fuel);
+ EngineLineCorrectionFactor(fuel);
+ VehicleLineSlope(fuel);
TimeIntegral<Kilogram>(GetColumnName(fuel, ModalResultField.FCMap));
TimeIntegral<Kilogram>(GetColumnName(fuel, ModalResultField.FCNCVc));
TimeIntegral<Kilogram>(GetColumnName(fuel, ModalResultField.FCWHTCc));
diff --git a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
index df89f178b4995ecf2b7f0d53f188ba2ebaa87e85..f2ee8b3a9cf9d5590b77ad65ec3a18cf727d1be2 100644
--- a/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
@@ -67,7 +67,7 @@ namespace TUGraz.VectoCore.OutputData
Fields.FC_AUXHTR_H_CORR, Fields.FC_AUXHTR_KM_CORR,
Fields.FCFINAL_H, Fields.FCFINAL_KM, Fields.FCFINAL_LITERPER100KM, Fields.FCFINAL_LITERPER100TKM,
Fields.FCFINAL_LiterPer100M3KM, Fields.FCFINAL_LiterPer100PassengerKM,
- Fields.SPECIFIC_FC, Fields.K_VEHLINE
+ Fields.SPECIFIC_FC, Fields.K_VEHLINE, Fields.K_ENGLINE
};
// ReSharper restore InconsistentNaming
@@ -175,7 +175,7 @@ namespace TUGraz.VectoCore.OutputData
Table.Columns.AddRange(
new[] {
- Fields.CO2_KM, Fields.CO2_TKM, Fields.CO2_M3KM, Fields.CO2_PKM, Fields.P_WHEEL_POS, Fields.P_FCMAP_POS,
+ Fields.CO2_KM, Fields.CO2_TKM, Fields.CO2_M3KM, Fields.CO2_PKM, Fields.P_WHEEL, Fields.P_WHEEL_POS, Fields.P_FCMAP, Fields.P_FCMAP_POS,
Fields.E_FCMAP_POS, Fields.E_FCMAP_NEG, Fields.E_POWERTRAIN_INERTIA, Fields.E_AUX, Fields.E_CLUTCH_LOSS,
Fields.E_TC_LOSS, Fields.E_SHIFT_LOSS, Fields.E_GBX_LOSS, Fields.E_RET_LOSS, Fields.E_ANGLE_LOSS,
Fields.E_AXL_LOSS, Fields.E_BRAKE, Fields.E_VEHICLE_INERTIA, Fields.E_WHEEL, Fields.E_AIR, Fields.E_ROLL, Fields.E_GRAD,
@@ -328,8 +328,10 @@ namespace TUGraz.VectoCore.OutputData
}
row[Fields.P_WHEEL_POS] = modData.PowerWheelPositive().ConvertToKiloWatt();
-
+ row[Fields.P_WHEEL] = modData.PowerWheel().ConvertToKiloWatt();
+
row[Fields.P_FCMAP_POS] = modData.TotalPowerEnginePositiveAverage().ConvertToKiloWatt();
+ row[Fields.P_FCMAP] = modData.TotalPowerEngineAverage().ConvertToKiloWatt();
WriteAuxiliaries(modData, row, runData.BusAuxiliaries != null);
@@ -438,10 +440,15 @@ namespace TUGraz.VectoCore.OutputData
var fcModSum = modData.TotalFuelConsumption(ModalResultField.FCFinal, fuel);
- var correction = modData.VehicleLineCorrectionFactor(fuel);
-
- row[FcCol(Fields.K_VEHLINE, suffix)] = correction.ConvertToGramPerKiloWattHour();
+ var correction = modData.EngineLineCorrectionFactor(fuel);
+ row[FcCol(Fields.K_ENGLINE, suffix)] = correction.ConvertToGramPerKiloWattHour();
+
+ var vehLine = modData.VehicleLineSlope(fuel);
+ if (vehLine != null) {
+ row[FcCol(Fields.K_VEHLINE, suffix)] = vehLine.ConvertToGramPerKiloWattHour();
+ }
+
var fcEssCorr = fcModSum + correction * workESS;
row[FcCol(Fields.FCESS_H_CORR, suffix)] = duration != null ? (fcEssCorr / duration).ConvertToGrammPerHour() : null;
@@ -679,7 +686,7 @@ namespace TUGraz.VectoCore.OutputData
row[Fields.E_PS_CompressorOff] = modData.EnergyPneumaticCompressorPowerOff().ConvertToKiloWattHour();
row[Fields.E_PS_CompressorOn] = modData.EnergyPneumaticCompressorOn().ConvertToKiloWattHour();
- row[Fields.E_BusAux_ES_generated] = modData.EnergyBusAuxESGenerated().ConvertToKiloWattHour();
+ row[Fields.E_BusAux_ES_generated] = modData.EnergyBusAuxESGeneratedMech().ConvertToKiloWattHour();
row[Fields.E_BusAux_ES_consumed] = modData.EnergyBusAuxESConsumed().ConvertToKiloWattHour();
row[Fields.Delta_E_BusAux_Battery] = (runData.BusAuxiliaries.ElectricalUserInputsConfig.SmartElectrical
? modData.DeltaSOCBusAuxBattery() * runData.BusAuxiliaries.ElectricalUserInputsConfig.ElectricStorageCapacity
@@ -1054,7 +1061,9 @@ namespace TUGraz.VectoCore.OutputData
public const string CO2_PKM = "CO2 [g/Pkm]";
public const string P_WHEEL_POS = "P_wheel_in_pos [kW]";
+ public const string P_WHEEL = "P_wheel_in [kW]";
public const string P_FCMAP_POS = "P_fcmap_pos [kW]";
+ public const string P_FCMAP = "P_fcmap [kW]";
public const string E_FORMAT = "E_{0} [kWh]";
public const string E_AUX_FORMAT = "E_aux_{0} [kWh]";
@@ -1063,6 +1072,7 @@ namespace TUGraz.VectoCore.OutputData
public const string E_AUX_ESS_MECH = "E_aux_ess_mech [kWh]";
public const string E_ICE_START = "E_ice_start [kWh]";
public const string NUM_ICE_STARTS = "ice_starts [-]";
+ public const string K_ENGLINE = "k_engline{0} [g/kWh]";
public const string K_VEHLINE = "k_vehline{0} [g/kWh]";
public const string E_WHR_EL = "E_WHR_el [kWh]";
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs
index 01ffdcf1fd7d6359e6e9bec7083b089766b3000a..f3eeb85829fbeb6ab8b14131656eb4eaf20a3ad9 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReportCompletedBus.cs
@@ -59,7 +59,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
new XElement(tns + XMLNames.Bus_LowerDeck, modelData.VehicleData.InputData.NumberOfPassengersLowerDeck),
new XElement(tns + XMLNames.Bus_UpperDeck, modelData.VehicleData.InputData.NumberOfPassengersUpperDeck)
),
- new XElement(tns + XMLNames.Bus_LowEntry, modelData.VehicleData.InputData.FloorType == FloorType.LowFloor),
+ new XElement(tns + XMLNames.Bus_LowEntry, modelData.VehicleData.InputData.LowEntry),
new XElement(tns + XMLNames.Bus_HeighIntegratedBody, modelData.VehicleData.InputData.Height.ToXMLFormat(3)),
new XElement(tns + XMLNames.Bus_VehicleLength, modelData.VehicleData.InputData.Length.ToXMLFormat(3)),
new XElement(tns + XMLNames.Bus_VehicleWidth, modelData.VehicleData.InputData.Width.ToXMLFormat(3)),
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
index c8daa8719d77651195acca2050be83ae42690fd8..43be3f6bae2a7307405baeb39a07f25be02a07ac 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs
@@ -185,7 +185,7 @@ namespace TUGraz.VectoCore.OutputData.XML
var correction = 0.SI<KilogramPerWattSecond>();
if (!(workWHR + workESS + workBusAuxCorr).IsEqual(0)) {
- correction = data.VehicleLineCorrectionFactor(entry);
+ correction = data.EngineLineCorrectionFactor(entry);
}
var fcAuxHtr = 0.SI<Kilogram>();
if (firstFuel) {
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs
index 916452a0502af2fdf877f225c0aa9c475b7d0770..55b66e65deed1369944482d30ae80a0b61a208f7 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportPrimaryVehicle.cs
@@ -60,7 +60,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
protected override void OutputReports()
{
- base.OutputReports();
+ Writer.WriteReport(ReportType.DeclarationReportManufacturerXML, ManufacturerRpt.Report);
Writer.WriteReport(ReportType.DeclarationReportPrimaryVehicleXML, _primaryReport.Report);
}
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs
index cabaedec7016c2a542cf1013113ee63ebba63e7b..0860b82c6c204cdb357c982876fa57b92074eba3 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportCompletedBus.cs
@@ -54,7 +54,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
new XElement(tns + XMLNames.Bus_LowerDeck, modelData.VehicleData.InputData.NumberOfPassengersLowerDeck),
new XElement(tns + XMLNames.Bus_UpperDeck, modelData.VehicleData.InputData.NumberOfPassengersUpperDeck)
),
- new XElement(tns +XMLNames.Bus_LowEntry, modelData.VehicleData.InputData.FloorType == FloorType.LowFloor),
+ new XElement(tns +XMLNames.Bus_LowEntry, modelData.VehicleData.InputData.LowEntry),
new XElement(tns + XMLNames.Bus_HeighIntegratedBody, modelData.VehicleData.InputData.Height.ToXMLFormat(3)),
new XElement(tns + XMLNames.Bus_VehicleLength, modelData.VehicleData.InputData.Length.ToXMLFormat(3)),
new XElement(tns + XMLNames.Bus_VehicleWidth, modelData.VehicleData.InputData.Width.ToXMLFormat(3)),
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportPrimaryBus.cs b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportPrimaryBus.cs
index ccd4d9ae6d229c0cab2eba00fa6b7d343b4d762f..f1b62a28de21ca8620866c8eff7e573c2160194a 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportPrimaryBus.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReportPrimaryBus.cs
@@ -20,7 +20,7 @@ namespace TUGraz.VectoCore.OutputData.XML {
new XElement(tns + XMLNames.Vehicle_VIN, modelData.VehicleData.VIN),
new XElement(
tns + XMLNames.Vehicle_GrossVehicleMass,
- XMLHelper.ValueAsUnit(modelData.VehicleData.GrossVehicleMass, XMLNames.Unit_t, 1)),
+ XMLHelper.ValueAsUnit(modelData.VehicleData.InputData.GrossVehicleMassRating, XMLNames.Unit_t, 1)),
new XElement(
tns + XMLNames.Vehicle_CurbMassChassis, XMLHelper.ValueAsUnit(modelData.VehicleData.CurbMass, XMLNames.Unit_kg)),
new XElement(tns + XMLNames.Vehicle_ZeroEmissionVehicle, modelData.VehicleData.ZeroEmissionVehicle),
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
index dbf44fdc8cdc98be5e17abadcffb3ffe7cdf8fba..b70fecc106ca097a4fb83546707ce054cdb02d00 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLPrimaryVehicleReport.cs
@@ -115,7 +115,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Vehicle_VehicleCategory, modelData.VehicleData.VehicleCategory.ToXMLFormat()),
new XElement(tns + XMLNames.Vehicle_AxleConfiguration, modelData.VehicleData.AxleConfiguration.GetName()),
new XElement(tns + XMLNames.Vehicle_Articulated, modelData.VehicleData.InputData.Articulated),
- new XElement(tns + XMLNames.TPMLM, modelData.VehicleData.GrossVehicleMass.ToXMLFormat(0)),
+ new XElement(tns + XMLNames.TPMLM, modelData.VehicleData.InputData.GrossVehicleMassRating.ToXMLFormat(0)),
new XElement(tns + XMLNames.Vehicle_IdlingSpeed, modelData.EngineData.IdleSpeed.AsRPM.ToXMLFormat(0)),
new XElement(tns + XMLNames.Vehicle_RetarderType, modelData.Retarder.Type.ToXMLFormat()),
modelData.Retarder.Type.IsDedicatedComponent()
diff --git a/VectoCore/VectoCore/Properties/AssemblyInfo.cs b/VectoCore/VectoCore/Properties/AssemblyInfo.cs
index 8cb32b828319e160527cb3144be81b546f991ec7..c8cb7872fd5cb2161391e1f72853711d93bfc0d7 100644
--- a/VectoCore/VectoCore/Properties/AssemblyInfo.cs
+++ b/VectoCore/VectoCore/Properties/AssemblyInfo.cs
@@ -53,3 +53,4 @@ using System.Runtime.InteropServices;
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("XMLTest")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VECTO_GIT")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VectoAuxiliariesTests")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VECTO3")]
diff --git a/VectoCore/VectoCore/Resources/Declaration/Buses/ElectricConsumers.csv b/VectoCore/VectoCore/Resources/Declaration/Buses/ElectricConsumers.csv
index 3e404525c010276fa0cecd6c757bd5358ec564d7..edb51f8d274cbe5af092f5dc018c651fdcf60661 100644
--- a/VectoCore/VectoCore/Resources/Declaration/Buses/ElectricConsumers.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/Buses/ElectricConsumers.csv
@@ -1,6 +1,6 @@
Category , Consumer , Base Vehicle , Default Consumer , Bonus , Heavy Urban , Urban , Suburban , Interurban , Coach , PhaseIdle , Number in Vehicle , Comment
Veh. Electronics & Engine , controllers & valves , 1 , 1 , 0 , 25.0 , 25.0 , 25.0 , 25.0 , 25.0 , 1.0 , 1.0 ,
-Vehicle basic equipment , Radio , 0 , 1 , 0 , 2.0 , 2.0 , 2.0 , 5.0 , 9.0 , 0.8 , 1.0 ,
+Vehicle basic equipment , Radio , 0 , 1 , 0 , 1.0 , 1.0 , 1.0 , 4.0 , 9.0 , 0.8 , 1.0 ,
Vehicle basic equipment , Fridge , 0 , 0 , 0 , 4.0 , 4.0 , 4.0 , 4.0 , 4.0 , 0.5 , 1.0 ,
Vehicle basic equipment , Kitchen Standard , 0 , 0 , 0 , 67.0 , 67.0 , 67.0 , 67.0 , 67.0 , 0.05 , 1.0 ,
Vehicle basic equipment , Interior lights per meter , 0 , 1 , 0 , 1.0 , 1.0 , 1.0 , 1.0 , 1.1 , 0.7 , f_IntLight(L_CoC) , per meter vehicle length
diff --git a/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_CI_Normed.vmap b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_CI_Normed.vmap
index 945952c733112095a57c1ee1dc6726f548387946..b50d63eff1931c4985b1ee49e7580f9973457ffc 100644
--- a/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_CI_Normed.vmap
+++ b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_CI_Normed.vmap
@@ -1,142 +1,157 @@
-engine speed , torque , fuel consumption
--0.08 , 0 , 0.833714286
--0.08 , 0.123942857 , 2.022142857
--0.08 , 0.247885714 , 3.39252
--0.08 , 0.371828571 , 4.905685714
--0.08 , 0.495771429 , 6.119011429
--0.08 , 0.619714286 , 7.459428571
--0.08 , 0.743657143 , 8.900257143
--0.08 , 0.8676 , 10.34146857
--0.08 , 0.991542857 , 11.78267429
-0 , 0 , 0.833714286
-0 , 0.123942857 , 2.022142857
-0 , 0.247885714 , 3.39252
-0 , 0.371828571 , 4.905685714
-0 , 0.495771429 , 6.119011429
-0 , 0.619714286 , 7.459428571
-0 , 0.743657143 , 8.900257143
-0 , 0.8676 , 10.34146857
-0 , 0.991542857 , 11.78267429
-0 , 1.115485714 , 13.22388571
-0 , 1.239428571 , 14.66509714
-0.124083333 , 0 , 1.012394286
-0.124083333 , 0.123942857 , 2.450154286
-0.124083333 , 0.247885714 , 4.188034286
-0.124083333 , 0.371828571 , 5.858811429
-0.124083333 , 0.495771429 , 7.551171429
-0.124083333 , 0.619714286 , 9.297765714
-0.124083333 , 0.743657143 , 11.14539429
-0.124083333 , 0.8676 , 12.98051429
-0.124083333 , 0.991542857 , 14.89544
-0.124083333 , 1.115485714 , 16.78917143
-0.124083333 , 1.239428571 , 18.68569143
-0.248166667 , 0 , 1.349228571
-0.248166667 , 0.123942857 , 3.069422857
-0.248166667 , 0.247885714 , 4.998531429
-0.248166667 , 0.371828571 , 6.868497143
-0.248166667 , 0.495771429 , 8.938565714
-0.248166667 , 0.619714286 , 11.05635429
-0.248166667 , 0.743657143 , 13.18348571
-0.248166667 , 0.8676 , 15.35103429
-0.248166667 , 0.991542857 , 17.60867429
-0.248166667 , 1.115485714 , 19.9168
-0.248166667 , 1.239428571 , 22.37433714
-0.37225 , 0 , 1.69612
-0.37225 , 0.123942857 , 3.693537143
-0.37225 , 0.247885714 , 5.772954286
-0.37225 , 0.371828571 , 7.916434286
-0.37225 , 0.495771429 , 10.32497714
-0.37225 , 0.619714286 , 12.79068571
-0.37225 , 0.743657143 , 15.16765714
-0.37225 , 0.8676 , 17.62722857
-0.37225 , 0.991542857 , 20.17409714
-0.37225 , 1.115485714 , 22.88359429
-0.37225 , 1.239428571 , 25.80726857
-0.496308333 , 0 , 1.88412
-0.496308333 , 0.123942857 , 4.109457143
-0.496308333 , 0.247885714 , 6.451142857
-0.496308333 , 0.371828571 , 8.983194286
-0.496308333 , 0.495771429 , 11.76012571
-0.496308333 , 0.619714286 , 14.56274857
-0.496308333 , 0.743657143 , 17.27015429
-0.496308333 , 0.8676 , 20.00355429
-0.496308333 , 0.991542857 , 22.87234286
-0.496308333 , 1.115485714 , 25.99822286
-0.496308333 , 1.239428571 , 29.05948571
-0.632658333 , 0 , 2.344085714
-0.632658333 , 0.123942857 , 4.720297143
-0.632658333 , 0.247885714 , 7.47568
-0.632658333 , 0.371828571 , 10.35794857
-0.632658333 , 0.495771429 , 13.28320571
-0.632658333 , 0.619714286 , 16.34954857
-0.632658333 , 0.743657143 , 19.53486286
-0.632658333 , 0.8676 , 22.72797714
-0.632658333 , 0.991542857 , 26.25164
-0.632658333 , 1.115485714 , 29.99198286
-0.632658333 , 1.239428571 , 33.34870286
-0.736666667 , 0 , 2.677051429
-0.736666667 , 0.123942857 , 5.251885714
-0.736666667 , 0.247885714 , 8.260394286
-0.736666667 , 0.371828571 , 11.38810286
-0.736666667 , 0.495771429 , 14.6036
-0.736666667 , 0.619714286 , 17.90076
-0.736666667 , 0.743657143 , 21.35075429
-0.736666667 , 0.8676 , 24.89823429
-0.736666667 , 0.991542857 , 28.83475429
-0.736666667 , 1.115485714 , 32.91686857
-0.736666667 , 1.239428571 , 36.67493714
-0.84075 , 0 , 3.006514286
-0.84075 , 0.123942857 , 5.82852
-0.84075 , 0.247885714 , 9.054965714
-0.84075 , 0.371828571 , 12.42696
-0.84075 , 0.495771429 , 16.02126286
-0.84075 , 0.619714286 , 19.56134857
-0.84075 , 0.743657143 , 23.23957143
-0.84075 , 0.8676 , 27.14198857
-0.84075 , 0.991542857 , 31.43714857
-0.84075 , 1.115485714 , 35.80281143
-0.84075 , 1.239428571 , 40.041
-0.944833333 , 0 , 3.434742857
-0.944833333 , 0.123942857 , 6.592051663
-0.944833333 , 0.247885714 , 9.988029651
-0.944833333 , 0.371828571 , 13.71403235
-0.944833333 , 0.495771429 , 17.68206855
-0.944833333 , 0.619714286 , 21.41857826
-0.944833333 , 0.743657143 , 25.49572247
-0.944833333 , 0.8676 , 29.75499887
-0.944833333 , 0.991542857 , 34.28816316
-0.944833333 , 1.115485714 , 39.00082984
-0.944833333 , 1.239428571 , 43.64633474
-1.048841667 , 0 , 4.1168628
-1.048841667 , 0.123942857 , 7.510599514
-1.048841667 , 0.247885714 , 11.05083632
-1.048841667 , 0.371828571 , 15.01283399
-1.048841667 , 0.495771429 , 19.33653626
-1.048841667 , 0.619714286 , 23.5892016
-1.048841667 , 0.743657143 , 28.03754633
-1.048841667 , 0.8676 , 32.60922662
-1.048841667 , 0.991542857 , 37.32819753
-1.048841667 , 1.115485714 , 42.21491227
-1.048841667 , 1.239428571 , 47.07674427
-1.15285 , 0 , 4.798982743
-1.15285 , 0.123942857 , 8.429147366
-1.15285 , 0.247885714 , 12.11364299
-1.15285 , 0.371828571 , 16.31163564
-1.15285 , 0.495771429 , 20.99100397
-1.15285 , 0.619714286 , 25.75982494
-1.15285 , 0.743657143 , 30.57937019
-1.15285 , 0.8676 , 35.46345438
-1.15285 , 0.991542857 , 40.3682319
-1.15285 , 1.115485714 , 45.42899471
-1.15285 , 1.239428571 , 50.5071538
-1.256858333 , 0 , 5.481102686
-1.256858333 , 0.123942857 , 9.347695217
-1.256858333 , 0.247885714 , 13.17644966
-1.256858333 , 0.371828571 , 17.61043729
-1.256858333 , 0.495771429 , 22.64547167
-1.256858333 , 0.619714286 , 27.93044827
-1.256858333 , 0.743657143 , 33.12119405
-1.256858333 , 0.8676 , 38.31768213
-1.256858333 , 0.991542857 , 43.40826627
-1.256858333 , 1.115485714 , 48.64307714
-1.256858333 , 1.239428571 , 53.93756333
\ No newline at end of file
+n_norm , P_norm , FC_norm [(g/h)/P_rated]
+-0.08 , 0 , 4.168571429
+-0.08 , 0.032707749 , 10.11071429
+-0.08 , 0.065415499 , 16.9626
+-0.08 , 0.098123248 , 24.52842857
+-0.08 , 0.130830998 , 30.59505714
+-0.08 , 0.163538747 , 37.29714286
+-0.08 , 0.196246497 , 44.50128571
+-0.08 , 0.228954246 , 51.70734286
+-0.08 , 0.261661995 , 58.91337143
+-0.08 , 0.294369745 , 66.11942857
+-0.08 , 0.327077494 , 73.32548571
+-0.08 , 0.490616242 , 109.9882286
+0 , 0 , 4.168571429
+0 , 0.038937797 , 10.11071429
+0 , 0.077875594 , 16.9626
+0 , 0.116813391 , 24.52842857
+0 , 0.155751188 , 30.59505714
+0 , 0.194688985 , 37.29714286
+0 , 0.233626782 , 44.50128571
+0 , 0.272564579 , 51.70734286
+0 , 0.311502376 , 58.91337143
+0 , 0.350440173 , 66.11942857
+0 , 0.389377969 , 73.32548571
+0 , 0.584066954 , 109.9882286
+0.124083333 , 0 , 5.061971429
+0.124083333 , 0.04860086 , 12.25077143
+0.124083333 , 0.09720172 , 20.94017143
+0.124083333 , 0.145802581 , 29.29405714
+0.124083333 , 0.194403441 , 37.75585714
+0.124083333 , 0.243004301 , 46.48882857
+0.124083333 , 0.291605161 , 55.72697143
+0.124083333 , 0.340206022 , 64.90257143
+0.124083333 , 0.388806882 , 74.4772
+0.124083333 , 0.437407742 , 83.94585714
+0.124083333 , 0.486008602 , 93.42845714
+0.124083333 , 0.729012903 , 140.1426857
+0.248166667 , 0 , 6.746142857
+0.248166667 , 0.058263923 , 15.34711429
+0.248166667 , 0.116527847 , 24.99265714
+0.248166667 , 0.17479177 , 34.34248571
+0.248166667 , 0.233055694 , 44.69282857
+0.248166667 , 0.291319617 , 55.28177143
+0.248166667 , 0.349583541 , 65.91742857
+0.248166667 , 0.407847464 , 76.75517143
+0.248166667 , 0.466111388 , 88.04337143
+0.248166667 , 0.524375311 , 99.584
+0.248166667 , 0.582639235 , 111.8716857
+0.248166667 , 0.873958852 , 167.8075286
+0.37225 , 0 , 8.4806
+0.37225 , 0.067926987 , 18.46768571
+0.37225 , 0.135853974 , 28.86477143
+0.37225 , 0.20378096 , 39.58217143
+0.37225 , 0.271707947 , 51.62488571
+0.37225 , 0.339634934 , 63.95342857
+0.37225 , 0.407561921 , 75.83828571
+0.37225 , 0.475488907 , 88.13614286
+0.37225 , 0.543415894 , 100.8704857
+0.37225 , 0.611342881 , 114.4179714
+0.37225 , 0.679269868 , 129.0363429
+0.37225 , 1.018904802 , 193.5545143
+0.496308333 , 0 , 9.4206
+0.496308333 , 0.077588103 , 20.54728571
+0.496308333 , 0.155176206 , 32.25571429
+0.496308333 , 0.232764309 , 44.91597143
+0.496308333 , 0.310352413 , 58.80062857
+0.496308333 , 0.387940516 , 72.81374286
+0.496308333 , 0.465528619 , 86.35077143
+0.496308333 , 0.543116722 , 100.0177714
+0.496308333 , 0.620704825 , 114.3617143
+0.496308333 , 0.698292928 , 129.9911143
+0.496308333 , 0.775881032 , 145.2974286
+0.496308333 , 1.163821547 , 217.9461429
+0.632658333 , 0 , 11.72042857
+0.632658333 , 0.08820644 , 23.60148571
+0.632658333 , 0.176412881 , 37.3784
+0.632658333 , 0.264619321 , 51.78974286
+0.632658333 , 0.352825762 , 66.41602857
+0.632658333 , 0.441032202 , 81.74774286
+0.632658333 , 0.529238642 , 97.67431429
+0.632658333 , 0.617445083 , 113.6398857
+0.632658333 , 0.705651523 , 131.2582
+0.632658333 , 0.793857963 , 149.9599143
+0.632658333 , 0.882064404 , 166.7435143
+0.632658333 , 1.323096606 , 250.1152714
+0.736666667 , 0 , 13.38525714
+0.736666667 , 0.096306151 , 26.25942857
+0.736666667 , 0.192612302 , 41.30197143
+0.736666667 , 0.288918453 , 56.94051429
+0.736666667 , 0.385224604 , 73.018
+0.736666667 , 0.481530756 , 89.5038
+0.736666667 , 0.577836907 , 106.7537714
+0.736666667 , 0.674143058 , 124.4911714
+0.736666667 , 0.770449209 , 144.1737714
+0.736666667 , 0.86675536 , 164.5843429
+0.736666667 , 0.963061511 , 183.3746857
+0.736666667 , 1.444592267 , 275.0620286
+0.84075 , 0 , 15.03257143
+0.84075 , 0.104411703 , 29.1426
+0.84075 , 0.208823405 , 45.27482857
+0.84075 , 0.313235108 , 62.1348
+0.84075 , 0.41764681 , 80.10631429
+0.84075 , 0.522058513 , 97.80674286
+0.84075 , 0.626470215 , 116.1978571
+0.84075 , 0.730881918 , 135.7099429
+0.84075 , 0.83529362 , 157.1857429
+0.84075 , 0.939705323 , 179.0140571
+0.84075 , 1.044117025 , 200.205
+0.84075 , 1.566175538 , 300.3075
+0.944833333 , 0 , 17.17371429
+0.944833333 , 0.112517254 , 32.96025831
+0.944833333 , 0.225034508 , 49.94014826
+0.944833333 , 0.337551762 , 68.57016174
+0.944833333 , 0.450069016 , 88.41034274
+0.944833333 , 0.56258627 , 107.0928913
+0.944833333 , 0.675103523 , 127.4786124
+0.944833333 , 0.787620777 , 148.7749943
+0.944833333 , 0.900138031 , 171.4408158
+0.944833333 , 1.012655285 , 195.0041492
+0.944833333 , 1.125172539 , 218.2316737
+0.944833333 , 1.687758809 , 327.3475105
+1.048841667 , 0 , 20.584314
+1.048841667 , 0.120616965 , 37.55299757
+1.048841667 , 0.241233929 , 55.2541816
+1.048841667 , 0.361850894 , 75.06416997
+1.048841667 , 0.482467859 , 96.68268129
+1.048841667 , 0.603084823 , 117.946008
+1.048841667 , 0.723701788 , 140.1877317
+1.048841667 , 0.844318752 , 163.0461331
+1.048841667 , 0.964935717 , 186.6409877
+1.048841667 , 1.085552682 , 211.0745614
+1.048841667 , 1.206169646 , 235.3837213
+1.048841667 , 1.80925447 , 353.075582
+1.15285 , 0 , 23.99491371
+1.15285 , 0.128716675 , 42.14573683
+1.15285 , 0.257433351 , 60.56821494
+1.15285 , 0.386150026 , 81.5581782
+1.15285 , 0.514866701 , 104.9550198
+1.15285 , 0.643583377 , 128.7991247
+1.15285 , 0.772300052 , 152.8968509
+1.15285 , 0.901016728 , 177.3172719
+1.15285 , 1.029733403 , 201.8411595
+1.15285 , 1.158450078 , 227.1449735
+1.15285 , 1.287166754 , 252.535769
+1.15285 , 1.93075013 , 378.8036535
+1.256858333 , 0 , 27.40551343
+1.256858333 , 0.136816386 , 46.73847609
+1.256858333 , 0.273632772 , 65.88224829
+1.256858333 , 0.410449158 , 88.05218643
+1.256858333 , 0.547265544 , 113.2273584
+1.256858333 , 0.68408193 , 139.6522414
+1.256858333 , 0.820898317 , 165.6059702
+1.256858333 , 0.957714703 , 191.5884107
+1.256858333 , 1.094531089 , 217.0413314
+1.256858333 , 1.231347475 , 243.2153857
+1.256858333 , 1.368163861 , 269.6878167
+1.256858333 , 2.052245791 , 404.531725
\ No newline at end of file
diff --git a/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_PI_Normed.vmap b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_PI_Normed.vmap
index 0d001e41be981697c86d41a3f97e7cf928df1892..fc3a96e2a76612adecf6e4031827d004c8f8d401 100644
--- a/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_PI_Normed.vmap
+++ b/VectoCore/VectoCore/Resources/Declaration/GenericBusData/EngineConsumptionMap_PI_Normed.vmap
@@ -1,155 +1,169 @@
-engine speed , torque , fuel consumption
--0.08 , 0 , 1.281070561
--0.08 , 0.17352 , 4.724945985
--0.08 , 0.34704 , 7.12113949
--0.08 , 0.52056 , 10.26908983
--0.08 , 0.69408 , 13.2754553
--0.08 , 0.8676 , 14.63223437
--0.08 , 1.04112 , 17.31655897
--0.08 , 1.21464 , 20.00088357
--0.08 , 1.38816 , 22.68520817
--0.08 , 1.56168 , 25.36953277
--0.08 , 1.7352 , 28.05385737
-0.03912 , 0 , 1.785514403
-0.03912 , 0.17352 , 5.706519778
-0.03912 , 0.34704 , 8.420120444
-0.03912 , 0.52056 , 11.93490905
-0.03912 , 0.69408 , 15.49442686
-0.03912 , 0.8676 , 17.15847024
-0.03912 , 1.04112 , 20.3719563
-0.03912 , 1.21464 , 23.58544236
-0.03912 , 1.38816 , 26.79892843
-0.03912 , 1.56168 , 30.01241449
-0.03912 , 1.7352 , 33.22590056
-0.15824 , 0 , 2.205694167
-0.15824 , 0.17352 , 6.513364853
-0.15824 , 0.34704 , 10.45224435
-0.15824 , 0.52056 , 13.8791352
-0.15824 , 0.69408 , 16.96052141
-0.15824 , 0.8676 , 20.70168531
-0.15824 , 1.04112 , 24.4303356
-0.15824 , 1.21464 , 28.15898589
-0.15824 , 1.38816 , 31.88763618
-0.15824 , 1.56168 , 35.61628647
-0.15824 , 1.7352 , 39.34493676
-0.27736 , 0 , 2.248609885
-0.27736 , 0.17352 , 7.014365499
-0.27736 , 0.34704 , 11.18511458
-0.27736 , 0.52056 , 15.50407158
-0.27736 , 0.69408 , 18.9852033
-0.27736 , 0.8676 , 22.34718274
-0.27736 , 1.04112 , 26.7306822
-0.27736 , 1.21464 , 31.08281531
-0.27736 , 1.38816 , 35.43494841
-0.27736 , 1.56168 , 39.78708152
-0.27736 , 1.7352 , 44.13921462
-0.396456 , 0 , 2.103031701
-0.396456 , 0.17352 , 7.258840382
-0.396456 , 0.34704 , 11.65905911
-0.396456 , 0.52056 , 16.27931171
-0.396456 , 0.69408 , 20.97835005
-0.396456 , 0.8676 , 24.84639642
-0.396456 , 1.04112 , 28.39387396
-0.396456 , 1.21464 , 33.09327515
-0.396456 , 1.38816 , 37.79267633
-0.396456 , 1.56168 , 42.49207752
-0.396456 , 1.7352 , 47.19147871
-0.527352 , 0 , 2.471029987
-0.527352 , 0.17352 , 8.349737913
-0.527352 , 0.34704 , 13.44106853
-0.527352 , 0.52056 , 18.67999399
-0.527352 , 0.69408 , 24.11207405
-0.527352 , 0.8676 , 28.46131745
-0.527352 , 1.04112 , 32.34773468
-0.527352 , 1.21464 , 37.58074743
-0.527352 , 1.38816 , 42.81376017
-0.527352 , 1.56168 , 48.04677291
-0.527352 , 1.7352 , 53.27978566
-0.6272 , 0 , 2.889261833
-0.6272 , 0.17352 , 9.306087584
-0.6272 , 0.34704 , 14.89838527
-0.6272 , 0.52056 , 20.61579076
-0.6272 , 0.69408 , 26.65037247
-0.6272 , 0.8676 , 31.28839855
-0.6272 , 1.04112 , 35.39006764
-0.6272 , 1.21464 , 40.9884729
-0.6272 , 1.38816 , 46.58687815
-0.6272 , 1.56168 , 52.18528341
-0.6272 , 1.7352 , 57.78368866
-0.72712 , 0 , 3.246398557
-0.72712 , 0.17352 , 10.34201941
-0.72712 , 0.34704 , 16.46032694
-0.72712 , 0.52056 , 22.70891512
-0.72712 , 0.69408 , 29.35895087
-0.72712 , 0.8676 , 34.56642073
-0.72712 , 1.04112 , 38.99393332
-0.72712 , 1.21464 , 45.12686003
-0.72712 , 1.38816 , 51.25978674
-0.72712 , 1.56168 , 57.39271345
-0.72712 , 1.7352 , 63.52564016
-0.82704 , 0 , 3.721472295
-0.82704 , 0.17352 , 11.38474213
-0.82704 , 0.34704 , 17.98675799
-0.82704 , 0.52056 , 24.8752689
-0.82704 , 0.69408 , 32.01254743
-0.82704 , 0.8676 , 37.51079387
-0.82704 , 1.04112 , 42.34495891
-0.82704 , 1.21464 , 48.97198642
-0.82704 , 1.38816 , 55.59901392
-0.82704 , 1.56168 , 62.22604142
-0.82704 , 1.7352 , 68.85306893
-0.926888 , 0 , 4.502697002
-0.926888 , 0.17352 , 12.56627192
-0.926888 , 0.34704 , 19.68422557
-0.926888 , 0.52056 , 27.10351372
-0.926888 , 0.69408 , 34.53788245
-0.926888 , 0.8676 , 40.22106557
-0.926888 , 1.04112 , 45.38305504
-0.926888 , 1.21464 , 52.49376383
-0.926888 , 1.38816 , 59.60447263
-0.926888 , 1.56168 , 66.71518142
-0.926888 , 1.7352 , 73.82589021
-1.026808 , 0 , 5.28392171
-1.026808 , 0.17352 , 13.74780171
-1.026808 , 0.34704 , 21.38169315
-1.026808 , 0.52056 , 29.33175853
-1.026808 , 0.69408 , 37.06321748
-1.026808 , 0.8676 , 42.93133727
-1.026808 , 1.04112 , 48.42115117
-1.026808 , 1.21464 , 56.01554125
-1.026808 , 1.38816 , 63.60993134
-1.026808 , 1.56168 , 71.20432142
-1.026808 , 1.7352 , 78.7987115
-1.126728 , 0 , 6.065146418
-1.126728 , 0.17352 , 14.92933149
-1.126728 , 0.34704 , 23.07916074
-1.126728 , 0.52056 , 31.56000335
-1.126728 , 0.69408 , 39.58855251
-1.126728 , 0.8676 , 45.64160896
-1.126728 , 1.04112 , 51.4592473
-1.126728 , 1.21464 , 59.53731867
-1.126728 , 1.38816 , 67.61539004
-1.126728 , 1.56168 , 75.69346142
-1.126728 , 1.7352 , 83.77153279
-1.226648 , 0 , 6.089397149
-1.226648 , 0.17352 , 16.10735921
-1.226648 , 0.34704 , 25.06638993
-1.226648 , 0.52056 , 34.69587946
-1.226648 , 0.69408 , 43.26828054
-1.226648 , 0.8676 , 48.01774094
-1.226648 , 1.04112 , 56.06951404
-1.226648 , 1.21464 , 63.05909609
-1.226648 , 1.38816 , 71.62084875
-1.226648 , 1.56168 , 80.18260141
-1.226648 , 1.7352 , 88.74435408
-1.326568 , 0 , 7.828693432
-1.326568 , 0.17352 , 17.20854332
-1.326568 , 0.34704 , 27.01598305
-1.326568 , 0.52056 , 36.85856845
-1.326568 , 0.69408 , 43.22300046
-1.326568 , 0.8676 , 50.64725607
-1.326568 , 1.04112 , 67.5775586
-1.326568 , 1.21464 , 72.63368019
-1.326568 , 1.38816 , 82.50142632
-1.326568 , 1.56168 , 92.36917245
-1.326568 , 1.7352 , 102.2369186
\ No newline at end of file
+n_norm , P_norm , FC_norm [(g/h)/P_rated]
+-0.08 , 0 , 6.405352806
+-0.08 , 0.054512916 , 23.62472993
+-0.08 , 0.109025831 , 35.60569745
+-0.08 , 0.163538747 , 51.34544915
+-0.08 , 0.218051663 , 66.37727651
+-0.08 , 0.272564579 , 73.16117186
+-0.08 , 0.327077494 , 86.58279485
+-0.08 , 0.38159041 , 100.0044179
+-0.08 , 0.436103326 , 113.4260409
+-0.08 , 0.490616242 , 126.8476639
+-0.08 , 0.545129157 , 140.2692868
+-0.08 , 0.817693736 , 210.4039303
+0.03912 , 0 , 8.927572014
+0.03912 , 0.068041204 , 28.53259889
+0.03912 , 0.136082409 , 42.10060222
+0.03912 , 0.204123613 , 59.67454524
+0.03912 , 0.272164817 , 77.4721343
+0.03912 , 0.340206022 , 85.79235119
+0.03912 , 0.408247226 , 101.8597815
+0.03912 , 0.47628843 , 117.9272118
+0.03912 , 0.544329634 , 133.9946421
+0.03912 , 0.612370839 , 150.0620725
+0.03912 , 0.680412043 , 166.1295028
+0.03912 , 1.020618065 , 249.1942542
+0.15824 , 0 , 11.02847083
+0.15824 , 0.081569493 , 32.56682426
+0.15824 , 0.163138986 , 52.26122174
+0.15824 , 0.244708479 , 69.39567598
+0.15824 , 0.326277972 , 84.80260703
+0.15824 , 0.407847464 , 103.5084266
+0.15824 , 0.489416957 , 122.151678
+0.15824 , 0.57098645 , 140.7949295
+0.15824 , 0.652555943 , 159.4381809
+0.15824 , 0.734125436 , 178.0814323
+0.15824 , 0.815694929 , 196.7246838
+0.15824 , 1.223542393 , 295.0870257
+0.27736 , 0 , 11.24304942
+0.27736 , 0.095097781 , 35.0718275
+0.27736 , 0.190195563 , 55.92557292
+0.27736 , 0.285293344 , 77.5203579
+0.27736 , 0.380391126 , 94.92601651
+0.27736 , 0.475488907 , 111.7359137
+0.27736 , 0.570586689 , 133.653411
+0.27736 , 0.66568447 , 155.4140765
+0.27736 , 0.760782252 , 177.1747421
+0.27736 , 0.855880033 , 198.9354076
+0.27736 , 0.950977815 , 220.6960731
+0.27736 , 1.426466722 , 331.0441097
+0.396456 , 0 , 10.51515851
+0.396456 , 0.108623344 , 36.29420191
+0.396456 , 0.217246689 , 58.29529554
+0.396456 , 0.325870033 , 81.39655854
+0.396456 , 0.434493378 , 104.8917503
+0.396456 , 0.543116722 , 124.2319821
+0.396456 , 0.651740067 , 141.9693698
+0.396456 , 0.760363411 , 165.4663757
+0.396456 , 0.868986755 , 188.9633817
+0.396456 , 0.9776101 , 212.4603876
+0.396456 , 1.086233444 , 235.9573935
+0.396456 , 1.629350166 , 353.9360903
+0.527352 , 0 , 12.35514994
+0.527352 , 0.123489017 , 41.74868956
+0.527352 , 0.246978033 , 67.20534266
+0.527352 , 0.37046705 , 93.39996995
+0.527352 , 0.493956066 , 120.5603703
+0.527352 , 0.617445083 , 142.3065872
+0.527352 , 0.740934099 , 161.7386734
+0.527352 , 0.864423116 , 187.9037371
+0.527352 , 0.987912132 , 214.0688008
+0.527352 , 1.111401149 , 240.2338646
+0.527352 , 1.234890165 , 266.3989283
+0.527352 , 1.852335248 , 399.5983924
+0.6272 , 0 , 14.44630917
+0.6272 , 0.134828612 , 46.53043792
+0.6272 , 0.269657223 , 74.49192634
+0.6272 , 0.404485835 , 103.0789538
+0.6272 , 0.539314446 , 133.2518624
+0.6272 , 0.674143058 , 156.4419928
+0.6272 , 0.808971669 , 176.9503382
+0.6272 , 0.943800281 , 204.9423645
+0.6272 , 1.078628892 , 232.9343908
+0.6272 , 1.213457504 , 260.926417
+0.6272 , 1.348286116 , 288.9184433
+0.6272 , 2.022429173 , 433.377665
+0.72712 , 0 , 16.23199279
+0.72712 , 0.146176384 , 51.71009706
+0.72712 , 0.292352767 , 82.30163469
+0.72712 , 0.438529151 , 113.5445756
+0.72712 , 0.584705534 , 146.7947544
+0.72712 , 0.730881918 , 172.8321036
+0.72712 , 0.877058301 , 194.9696666
+0.72712 , 1.023234685 , 225.6343001
+0.72712 , 1.169411068 , 256.2989337
+0.72712 , 1.315587452 , 286.9635672
+0.72712 , 1.461763835 , 317.6282008
+0.72712 , 2.192645753 , 476.4423012
+0.82704 , 0 , 18.60736147
+0.82704 , 0.157524155 , 56.92371065
+0.82704 , 0.315048311 , 89.93378994
+0.82704 , 0.472572466 , 124.3763445
+0.82704 , 0.630096622 , 160.0627371
+0.82704 , 0.787620777 , 187.5539694
+0.82704 , 0.945144933 , 211.7247946
+0.82704 , 1.102669088 , 244.8599321
+0.82704 , 1.260193244 , 277.9950696
+0.82704 , 1.417717399 , 311.1302071
+0.82704 , 1.575241555 , 344.2653446
+0.82704 , 2.362862332 , 516.3980169
+0.926888 , 0 , 22.51348501
+0.926888 , 0.16886375 , 62.83135959
+0.926888 , 0.337727501 , 98.42112785
+0.926888 , 0.506591251 , 135.5175686
+0.926888 , 0.675455002 , 172.6894123
+0.926888 , 0.844318752 , 201.1053278
+0.926888 , 1.013182503 , 226.9152752
+0.926888 , 1.182046253 , 262.4688192
+0.926888 , 1.350910004 , 298.0223631
+0.926888 , 1.519773754 , 333.5759071
+0.926888 , 1.688637505 , 369.1294511
+0.926888 , 2.532956257 , 553.6941766
+1.026808 , 0 , 26.41960855
+1.026808 , 0.180211522 , 68.73900853
+1.026808 , 0.360423045 , 106.9084658
+1.026808 , 0.540634567 , 146.6587927
+1.026808 , 0.72084609 , 185.3160874
+1.026808 , 0.901057612 , 214.6566863
+1.026808 , 1.081269135 , 242.1057558
+1.026808 , 1.261480657 , 280.0777063
+1.026808 , 1.44169218 , 318.0496567
+1.026808 , 1.621903702 , 356.0216071
+1.026808 , 1.802115224 , 393.9935575
+1.026808 , 2.703172837 , 590.9903363
+1.126728 , 0 , 30.32573209
+1.126728 , 0.191559294 , 74.64665747
+1.126728 , 0.383118589 , 115.3958037
+1.126728 , 0.574677883 , 157.8000168
+1.126728 , 0.766237178 , 197.9427626
+1.126728 , 0.957796472 , 228.2080448
+1.126728 , 1.149355766 , 257.2962365
+1.126728 , 1.340915061 , 297.6865934
+1.126728 , 1.532474355 , 338.0769502
+1.126728 , 1.72403365 , 378.4673071
+1.126728 , 1.915592944 , 418.8576639
+1.126728 , 2.873389416 , 628.2864959
+1.226648 , 0 , 30.44698575
+1.226648 , 0.202907066 , 80.53679606
+1.226648 , 0.405814133 , 125.3319497
+1.226648 , 0.608721199 , 173.4793973
+1.226648 , 0.811628265 , 216.3414027
+1.226648 , 1.014535332 , 240.0887047
+1.226648 , 1.217442398 , 280.3475702
+1.226648 , 1.420349465 , 315.2954804
+1.226648 , 1.623256531 , 358.1042438
+1.226648 , 1.826163597 , 400.9130071
+1.226648 , 2.029070664 , 443.7217704
+1.226648 , 3.043605995 , 665.5826556
+1.326568 , 0 , 39.14346716
+1.326568 , 0.214254838 , 86.04271662
+1.326568 , 0.428509677 , 135.0799152
+1.326568 , 0.642764515 , 184.2928422
+1.326568 , 0.857019353 , 216.1150023
+1.326568 , 1.071274192 , 253.2362804
+1.326568 , 1.28552903 , 337.887793
+1.326568 , 1.499783868 , 363.1684009
+1.326568 , 1.714038707 , 412.5071316
+1.326568 , 1.928293545 , 461.8458622
+1.326568 , 2.142548383 , 511.1845929
+1.326568 , 3.213822575 , 766.7768893
diff --git a/VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv b/VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv
index 9548da237c6db24bab7baa623e3e76f0b08eba99..b569e4e215bea6e7654d907772652c366dbc8255 100644
--- a/VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv
+++ b/VectoCore/VectoCore/Resources/Declaration/PrimaryBusSegmentationTable.csv
@@ -2,25 +2,25 @@ HDV group , Production Stage , Vehicle Category , HDV SuperGroup , Articulated ,
## Heavy Bus Primary Vehicles
P31SD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 0 , CE , 0 , 100 , , Bus.vacc , CoachBus , 4.9 , 37.5/62.5 , 2.55 , 12 , 2.8 , 340 , 11975 , 80 , 0 , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P31DD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 1 , CF , 0 , 100 , , Bus.vacc , CoachBus , 6.2 , 37.5/62.5 , 2.55 , 10.5 , 3.8 , 340 , 12350 , 60 , 40 , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P32SD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 4.6 , 37.5/62.5 , 2.55 , 12 , 3.15 , 340 , 13150 , 45 , 0 , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P32DD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 1 , CB , - , 100 , , Bus.vacc , CoachBus , 5.2 , 37.5/62.5 , 2.55 , 10.5 , 3.7 , 340 , 13400 , 25 , 35 , , , , 3 , 2 , 1 , 2 , 1 , 1 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P32SD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 3.45 , 37.5/62.5 , 2.55 , 12 , 3.15 , 340 , 13150 , 45 , 0 , , , , 1.8 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P32DD , 1 , HeavyBus , P31_32 , - , 2 , 7.4 , 999 , 1 , CB , - , 100 , , Bus.vacc , CoachBus , 3.9 , 37.5/62.5 , 2.55 , 10.5 , 3.7 , 340 , 13400 , 25 , 35 , , , , 2.5 , 2 , 1 , 2 , 1 , 1 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
##
P33SD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 0 , CE , 0 , 100 , , Bus.vacc , CoachBus , 5.0 , 27.3/45.4/27.3 , 2.55 , 14.2 , 2.8 , 340 , 14175 , 104 , 0 , 3 , 3 , 3 , , , 3 , 2 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P33DD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 1 , CF , 0 , 100 , , Bus.vacc , CoachBus , 6.3 , 27.3/45.4/27.3 , 2.55 , 13.5 , 3.8 , 340 , 14725 , 78 , 52 , 3.7 , 3.7 , 3.7 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P34SD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 4.7 , 27.3/45.4/27.3 , 2.55 , 13.8 , 3.15 , 340 , 15213 , 59 , 0 , , , , 2.2 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P34DD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 1 , CB , - , 100 , , Bus.vacc , CoachBus , 5.3 , 27.3/45.4/27.3 , 2.55 , 14 , 3.7 , 340 , 17850 , 33 , 46 , , , , 3 , 2 , 1 , 4 , 1 , 1.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P34SD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 3.53 , 27.3/45.4/27.3 , 2.55 , 13.8 , 3.15 , 340 , 15213 , 59 , 0 , , , , 1.8 , 1.4 , 2 , 2 , 0.5 , 0.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P34DD , 1 , HeavyBus , P33_34 , 0 , 3 , 7.4 , 999 , 1 , CB , - , 100 , , Bus.vacc , CoachBus , 3.98 , 27.3/45.4/27.3 , 2.55 , 14 , 3.7 , 340 , 17850 , 33 , 46 , , , , 2.5 , 2 , 1 , 4 , 1 , 1.5 , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
#
P35SD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 0 , CG , 0 , 100 , , Bus.vacc , CoachBus , 5.1 , 24.3/35.2/40.5 , 2.55 , 18.2 , 2.8 , 340 , 17800 , 104 , 0 , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P35DD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 1 , CH , 0 , 100 , , Bus.vacc , CoachBus , 6.4 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.8 , 340 , 20250 , 78 , 52 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P36SD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 0 , CC , - , 100 , , Bus.vacc , CoachBus , 4.8 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.15 , 340 , 19267 , 59 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P36DD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 1 , CD , - , 100 , , Bus.vacc , CoachBus , 5.4 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.7 , 340 , 21375 , 33 , 46 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P36SD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 0 , CC , - , 100 , , Bus.vacc , CoachBus , 3.60 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.15 , 340 , 19267 , 59 , 0 , , , , 1.8 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P36DD , 1 , HeavyBus , P35_36 , 1 , 3 , 7.4 , 999 , 1 , CD , - , 100 , , Bus.vacc , CoachBus , 4.05 , 24.3/35.2/40.5 , 2.55 , 18.2 , 3.7 , 340 , 21375 , 33 , 46 , , , , 2.5 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
##
P37SD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 0 , CE , 0 , 100 , , Bus.vacc , CoachBus , 5.1 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 2.8 , 340 , 15000 , 125 , 0 , 3 , 3 , 3 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P37DD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 1 , CF , 0 , 100 , , Bus.vacc , CoachBus , 6.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.8 , 340 , 18700 , 94 , 62 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P38SD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 4.8 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.15 , 340 , 17500 , 70 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P38DD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 1 , CB , - , 100 , , Bus.vacc , CoachBus , 5.4 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.7 , 340 , 21200 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P38SD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 0 , CA , - , 100 , , Bus.vacc , CoachBus , 3.60 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.15 , 340 , 17500 , 70 , 0 , , , , 1.8 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P38DD , 1 , HeavyBus , P37_38 , 0 , 4 , 7.4 , 999 , 1 , CB , - , 100 , , Bus.vacc , CoachBus , 4.05 , 21.4/21.4/35.8/21.4 , 2.55 , 15 , 3.7 , 340 , 21200 , 39 , 55 , , , , 2.5 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
#
P39SD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 0 , CG , 0 , 100 , , Bus.vacc , CoachBus , 5.2 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 2.6 , 340 , 19600 , 125 , 0 , 3 , 3 , 3 , , , 3 , 3 , 0 , 0 , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
P39DD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 1 , CH , 0 , 100 , , Bus.vacc , CoachBus , 6.5 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.8 , 340 , 24800 , 94 , 62 , 3.7 , 3.7 , 3.7 , , , , , , , 6 , 2-stage , 15 , 0 , 0 , 0 , 0
-P40SD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 0 , CC , - , 100 , , Bus.vacc , CoachBus , 4.9 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.15 , 340 , 20950 , 70 , 0 , , , , 2.2 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
-P40DD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 1 , CD , - , 100 , , Bus.vacc , CoachBus , 5.5 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.7 , 340 , 24600 , 39 , 55 , , , , 3 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P40SD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 0 , CC , - , 100 , , Bus.vacc , CoachBus , 3.68 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.15 , 340 , 20950 , 70 , 0 , , , , 1.8 , 1.4 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
+P40DD , 1 , HeavyBus , P39_40 , 1 , 4 , 7.4 , 999 , 1 , CD , - , 100 , , Bus.vacc , CoachBus , 4.13 , 20.0/28.2/32.4/19.4 , 2.55 , 21 , 3.7 , 340 , 24600 , 39 , 55 , , , , 2.5 , 2 , , , , , 6 , 2-stage , 30 , 1 , 0 , 0 , 1
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
index 155b350e7352af3eb15ab0f9c0f7003d6f5161c9..2b097e7dc9f7710a506a6302a6ae091488ff24d6 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.6_Buses.xsd
@@ -52,7 +52,7 @@
<xs:simpleType>
<xs:restriction base="xs:int">
<xs:minInclusive value="1"/>
- <xs:maxInclusive value="9"/>
+ <xs:maxInclusive value="10"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
diff --git a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
index 3bf7ba451e78027431459e1940c175309046b55f..ad51b0e90d3b1596122463139eb96ab0a4768b59 100644
--- a/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
@@ -78,10 +78,10 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
{
var category = VehicleCategory.HeavyBusPrimaryVehicle;
var axleConfiguration = AxleConfiguration.AxleConfig_4x2;
- var floorType = FloorType.HighFloor;
+ //var floorType = FloorType.HighFloor;
var articulated = false;
- primarySegment = DeclarationData.PrimaryBusSegments.Lookup(category, axleConfiguration, articulated, floorType);
+ primarySegment = DeclarationData.PrimaryBusSegments.Lookup(category, axleConfiguration, articulated);
}
private void CompletedBusSegment()
@@ -174,11 +174,11 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
// generic loading values shall match expected values of primary vehicle for IU and CO cycle
// see TestPrimaryBusGroup41Test
case 0:
- Assert.AreEqual(1075.437, genericLoading.Value(), 1e-4);
+ Assert.AreEqual(879.903, genericLoading.Value(), 1e-4);
Assert.AreEqual(1058.5088, specificLoading.Value(), 1e-4);
break;
case 1:
- Assert.AreEqual(4301.748, genericLoading.Value(), 1e-4);
+ Assert.AreEqual(3519.612, genericLoading.Value(), 1e-4);
Assert.AreEqual(2130, specificLoading.Value(), 1e-0);
break;
case 2:
@@ -244,7 +244,7 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
var genericAirdragData = relatedRun.VectoRunDataGenericBody.AirdragData;
var specificAirdragData = relatedRun.VectoRunDataSpezificBody.AirdragData;
- var genericDragArea = 4.6.SI<SquareMeter>();
+ var genericDragArea = 3.45.SI<SquareMeter>();
var specificDragArea = 6.34.SI<SquareMeter>();
var genericVehicleHeight = 3.45.SI<Meter>();
@@ -269,13 +269,13 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
Assert.AreEqual(CrossWindCorrectionMode.DeclarationModeCorrection, genericAirdragData.CrossWindCorrectionMode);
Assert.AreEqual(genericAirdragData.CrossWindCorrectionMode, specificAirdragData.CrossWindCorrectionMode);
- Assert.AreEqual(genericValueExpected, currentGenericValue);
- Assert.AreEqual(expectedSpecificValue, currentSpecificValue);
-
Assert.AreEqual(genericDragArea, genericAirdragData.DeclaredAirdragArea);
Assert.AreEqual(genericDragArea, genericAirdragData.CrossWindCorrectionCurve.AirDragArea);
Assert.AreEqual(specificDragArea, specificAirdragData.DeclaredAirdragArea);
Assert.AreEqual(specificDragArea, specificAirdragData.CrossWindCorrectionCurve.AirDragArea);
+
+ Assert.AreEqual(genericValueExpected, currentGenericValue);
+ Assert.AreEqual(expectedSpecificValue, currentSpecificValue);
}
@@ -552,11 +552,11 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
switch (idx) {
case 0:
case 1:
- Assert.AreEqual(50.1950, genericElectric.AverageCurrentDemandInclBaseLoad(false, false).Value(), 1e-3);
- Assert.AreEqual(17.795, genericElectric.AverageCurrentDemandWithoutBaseLoad(false, false).Value(), 1e-3);
+ Assert.AreEqual(49.395, genericElectric.AverageCurrentDemandInclBaseLoad(false, false).Value(), 1e-3);
+ Assert.AreEqual(16.995, genericElectric.AverageCurrentDemandWithoutBaseLoad(false, false).Value(), 1e-3);
- Assert.AreEqual(54.981, specificElectric.AverageCurrentDemandInclBaseLoad(false, false).Value(), 1e-3);
- Assert.AreEqual(22.581, specificElectric.AverageCurrentDemandWithoutBaseLoad(false, false).Value(), 1e-3);
+ Assert.AreEqual(54.181, specificElectric.AverageCurrentDemandInclBaseLoad(false, false).Value(), 1e-3);
+ Assert.AreEqual(21.781, specificElectric.AverageCurrentDemandWithoutBaseLoad(false, false).Value(), 1e-3);
break;
case 2:
case 3:
@@ -668,8 +668,8 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
Assert.AreEqual(23.00, genericBusParam.BusWindowSurface.Value(), 1e-3);
Assert.AreEqual(22.745, specificBusParam.BusWindowSurface.Value(), 1e-3);
- Assert.AreEqual(152.865, genericBusParam.BusSurfaceArea.Value(), 1e-3);
- Assert.AreEqual(146.6130, specificBusParam.BusSurfaceArea.Value(), 1e-3);
+ Assert.AreEqual(140.865, genericBusParam.BusSurfaceArea.Value(), 1e-3);
+ Assert.AreEqual(134.783, specificBusParam.BusSurfaceArea.Value(), 1e-3);
Assert.AreEqual(81.09, genericBusParam.BusVolume.Value(), 1e-3);
Assert.AreEqual(75.4162, specificBusParam.BusVolume.Value(), 1e-3);
@@ -681,11 +681,11 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
// generic loading values shall match expected values of primary vehicle for IU and CO cycle
// see TestPrimaryBusGroup41Test
case 0:
- Assert.AreEqual(16.147, genericLoading, 1e-4);
+ Assert.AreEqual(13.393, genericLoading, 1e-4);
Assert.AreEqual(15.908575, specificLoading, 1e-4);
break;
case 1:
- Assert.AreEqual(61.588, genericLoading, 1e-4);
+ Assert.AreEqual(50.572, genericLoading, 1e-4);
Assert.AreEqual(31, specificLoading, 1e-0);
break;
case 2:
@@ -818,12 +818,12 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
case 0:
case 1://Interurban
Assert.AreEqual(31381.5, genericValue, 1e-3);
- Assert.AreEqual(31395.6875, specificValue, 1e-3);
+ Assert.AreEqual(28718.1875, specificValue, 1e-3);
break;
case 2:
case 3://Coach
Assert.AreEqual(47099.5, genericValue, 1e-3);
- Assert.AreEqual(45478.9375, specificValue, 1e-3);
+ Assert.AreEqual(41271.4375, specificValue, 1e-3);
break;
}
}
@@ -835,12 +835,12 @@ namespace TUGraz.VectoCore.Tests.Integration.CompletedBus
case 0:
case 1://Interurban
Assert.AreEqual(3.5, genericValue);
- Assert.AreEqual(3.55885197, specificValue, 1e-6);
+ Assert.AreEqual(3.55781260, specificValue, 1e-6);
break;
case 2:
case 3://Coach
Assert.AreEqual(3.5, genericValue);
- Assert.AreEqual(3.5638433, specificValue, 1e-6);
+ Assert.AreEqual(3.5632156, specificValue, 1e-6);
break;
}
}
diff --git a/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs b/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
index 786479e3ba638798828838029c131db06b13bd6c..d6d5e7f01f962f6eab37dcb910e07521c911c5b6 100644
--- a/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/VTP/VTPTest.cs
@@ -88,7 +88,7 @@ namespace TUGraz.VectoCore.Tests.Integration.VTP
[TestCase(@"TestData\Integration\VTPMode\GenericVehicle\class_5_generic vehicle_DECL.vecto", 45.6, 0.8972, TestName = "RunVTPHeavyLorry_Declaration"),
TestCase(@"TestData\Integration\VTPMode\MediumLorry\VTP_MediumLorry.vecto", 400.0, 1.06, TestName = "RunVTPMediumLorry_Declaration"),
TestCase(@"TestData\Integration\VTPMode\DualFuelVehicle\VTP_DualFuel.vecto", 43.5, 1.018, TestName = "RunVTPDualFuel_Declaration"),
- TestCase(@"TestData\Integration\VTPMode\HeavyBus\VTP_PrimaryBus.vecto", 14.2, 1.1323, TestName = "RunVTPHeavyPrimaryBus")
+ TestCase(@"TestData\Integration\VTPMode\HeavyBus\VTP_PrimaryBus.vecto", 14.2, 1.1413, TestName = "RunVTPHeavyPrimaryBus")
]
public void RunVTP_Declaration(string jobFile, double expectedDeclaredCO2, double expectedCVTP)
{
diff --git a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
index 1167a49fca4043a5d93298697a80bfe4c1e54f11..9f8b59c6606582f943c0cf488a3af01d96c8e42a 100644
--- a/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
+++ b/VectoCore/VectoCoreTest/Models/Declaration/DeclarationSegmentHeavyBusesTest.cs
@@ -13,72 +13,72 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
{
[
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_4x2, FloorType.LowFloor, false, false,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_4x2, true, false, false,
VehicleClass.ClassP31_32),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_4x2, FloorType.HighFloor, true, false,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_4x2, false, true, false,
VehicleClass.ClassP31_32),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_4x2, FloorType.LowFloor, false, true,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_4x2, true, false, true,
VehicleClass.ClassP31_32),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_4x2, FloorType.HighFloor, true, true,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_4x2, false, true, true,
VehicleClass.ClassP31_32),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x2, FloorType.LowFloor, false, false,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x2, true, false, false,
VehicleClass.ClassP33_34),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x2, FloorType.HighFloor, true, false,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x2, false, true, false,
VehicleClass.ClassP33_34),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x4, FloorType.LowFloor, false, false,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x4, true, false, false,
VehicleClass.ClassP33_34),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x4, FloorType.HighFloor, true, false,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x4, false, true, false,
VehicleClass.ClassP33_34),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x2, FloorType.LowFloor, false, true,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x2, true, false, true,
VehicleClass.ClassP35_36),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x2, FloorType.HighFloor, true, true,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x2, false, true, true,
VehicleClass.ClassP35_36),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x4, FloorType.LowFloor, false, true,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x4, true, false, true,
VehicleClass.ClassP35_36),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x4, FloorType.HighFloor, true, true,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_6x4, false, true, true,
VehicleClass.ClassP35_36),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x2, FloorType.LowFloor, false, false,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x2, true, false, false,
VehicleClass.ClassP37_38),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x2, FloorType.HighFloor, true, false,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x2, false, true, false,
VehicleClass.ClassP37_38),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x4, FloorType.LowFloor, false, false,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x4, true, false, false,
VehicleClass.ClassP37_38),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x4, FloorType.HighFloor, true, false,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x4, false, true, false,
VehicleClass.ClassP37_38),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x2, FloorType.LowFloor, false, true,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x2, true, false, true,
VehicleClass.ClassP39_40),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x2, FloorType.HighFloor, true, true,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x2, false, true, true,
VehicleClass.ClassP39_40),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x4, FloorType.LowFloor, false, true,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x4, true, false, true,
VehicleClass.ClassP39_40),
TestCase(
- VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x4, FloorType.HighFloor, true, true,
+ VehicleCategory.HeavyBusPrimaryVehicle, AxleConfiguration.AxleConfig_8x4, false, true, true,
VehicleClass.ClassP39_40),
]
public void SegmentLookupTest(
- VehicleCategory category, AxleConfiguration axleConfiguration, FloorType floorType, bool doubleDecker,
+ VehicleCategory category, AxleConfiguration axleConfiguration, bool floorType, bool doubleDecker,
bool articulated, VehicleClass expectedClass)
{
var segment = DeclarationData.PrimaryBusSegments.Lookup(
- category, axleConfiguration, articulated, floorType);
+ category, axleConfiguration, articulated);
Assert.AreEqual(10, segment.Missions.Length);
Assert.AreEqual(expectedClass, segment.VehicleClass);
@@ -92,11 +92,10 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
VehicleCategory = VehicleCategory.HeavyBusPrimaryVehicle,
AxleConfiguration = AxleConfiguration.AxleConfig_4x2,
Articulated = false,
- FloorType = FloorType.LowFloor,
DoubleDecker = false
};
var segment = DeclarationData.PrimaryBusSegments.Lookup(
- vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated, vehicleData.FloorType);
+ vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated);
Assert.AreEqual(10, segment.Missions.Length);
Assert.AreEqual(VehicleClass.ClassP31_32, segment.VehicleClass);
@@ -140,20 +139,20 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertMission(
segment.Missions[6],
missionType: MissionType.Interurban,
- cdxA: 4.6,
+ cdxA: 3.45,
length: 12,
width: 2.55,
height: 3.15,
curbMass: 13150,
- refLoad: 4301.748,
- lowLoad: 1075.437,
+ refLoad: 3519.612,
+ lowLoad: 879.903,
axleWeightDistribution: new[] { 0.375, 0.625 },
expVehicleEquipment: GetExpectedVehicleEquipment(2, 2, 0.5, 0.5)
);
AssertMission(
segment.Missions[7],
missionType: MissionType.Coach,
- cdxA: 4.6,
+ cdxA: 3.45,
length: 12,
width: 2.55,
height: 3.15,
@@ -167,20 +166,20 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertMission(
segment.Missions[8],
missionType: MissionType.Interurban,
- cdxA: 5.2,
+ cdxA: 3.9,
length: 10.5,
width: 2.55,
height: 3.7,
curbMass: 13400,
- refLoad: 5051.295,
- lowLoad: 1262.82375,
+ refLoad: 4209.4125,
+ lowLoad: 1052.353125,
axleWeightDistribution: new[] { 0.375, 0.625 },
expVehicleEquipment: GetExpectedVehicleEquipment(1, 2, 1, 1)
);
AssertMission(
segment.Missions[9],
missionType: MissionType.Coach,
- cdxA: 5.2,
+ cdxA: 3.9,
length: 10.5,
width: 2.55,
height: 3.7,
@@ -200,11 +199,10 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
VehicleCategory = VehicleCategory.HeavyBusPrimaryVehicle,
AxleConfiguration = AxleConfiguration.AxleConfig_6x2,
Articulated = false,
- FloorType = FloorType.LowFloor,
DoubleDecker = false
};
var segment = DeclarationData.PrimaryBusSegments.Lookup(
- vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated, vehicleData.FloorType);
+ vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated);
Assert.AreEqual(10, segment.Missions.Length);
Assert.AreEqual(VehicleClass.ClassP33_34, segment.VehicleClass);
@@ -246,20 +244,20 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertMission(
segment.Missions[6],
missionType: MissionType.Interurban,
- cdxA: 4.7,
+ cdxA: 3.53,
length: 13.8,
width: 2.55,
height: 3.15,
curbMass: 15213,
- refLoad: 5018.706,
- lowLoad: 1254.6765,
+ refLoad: 4106.214,
+ lowLoad: 1026.5535,
axleWeightDistribution: new[] { 0.273, 0.454, 0.273 },
expVehicleEquipment: GetExpectedVehicleEquipment(2, 2, 0.5, 0.5)
);
AssertMission(
segment.Missions[7],
missionType: MissionType.Coach,
- cdxA: 4.7,
+ cdxA: 3.53,
length: 13.8,
width: 2.55,
height: 3.15,
@@ -273,20 +271,20 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertMission(
segment.Missions[8],
missionType: MissionType.Interurban,
- cdxA: 5.3,
+ cdxA: 3.98,
length: 14,
width: 2.55,
height: 3.7,
curbMass: 17850,
- refLoad: 6952.32,
- lowLoad: 1738.08,
+ refLoad: 5793.6,
+ lowLoad: 1448.4,
axleWeightDistribution: new[] { 0.273, 0.454, 0.273 },
expVehicleEquipment: GetExpectedVehicleEquipment(1, 4, 1, 1.5)
);
AssertMission(
segment.Missions[9],
missionType: MissionType.Coach,
- cdxA: 5.3,
+ cdxA: 3.98,
length: 14,
width: 2.55,
height: 3.7,
@@ -306,11 +304,10 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
VehicleCategory = VehicleCategory.HeavyBusPrimaryVehicle,
AxleConfiguration = AxleConfiguration.AxleConfig_6x2,
Articulated = true,
- FloorType = FloorType.LowFloor,
DoubleDecker = false
};
var segment = DeclarationData.PrimaryBusSegments.Lookup(
- vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated, vehicleData.FloorType);
+ vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated);
Assert.AreEqual(10, segment.Missions.Length);
Assert.AreEqual(VehicleClass.ClassP35_36, segment.VehicleClass);
@@ -352,20 +349,20 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertMission(
segment.Missions[6],
missionType: MissionType.Interurban,
- cdxA: 4.8,
+ cdxA: 3.6,
length: 18.2,
width: 2.55,
height: 3.15,
curbMass: 19267,
- refLoad: 6771.27,
- lowLoad: 1692.8175,
+ refLoad: 5540.130,
+ lowLoad: 1385.0325,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
AssertMission(
segment.Missions[7],
missionType: MissionType.Coach,
- cdxA: 4.8,
+ cdxA: 3.6,
length: 18.2,
width: 2.55,
height: 3.15,
@@ -378,20 +375,20 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertMission(
segment.Missions[8],
missionType: MissionType.Interurban,
- cdxA: 5.4,
+ cdxA: 4.05,
length: 18.2,
width: 2.55,
height: 3.7,
curbMass: 21375,
- refLoad: 9233.55,
- lowLoad: 2308.3875,
+ refLoad: 7694.625,
+ lowLoad: 1923.65625,
axleWeightDistribution: new[] { 0.243, 0.352, 0.405 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
AssertMission(
segment.Missions[9],
missionType: MissionType.Coach,
- cdxA: 5.4,
+ cdxA: 4.05,
length: 18.2,
width: 2.55,
height: 3.7,
@@ -411,11 +408,10 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
VehicleCategory = VehicleCategory.HeavyBusPrimaryVehicle,
AxleConfiguration = AxleConfiguration.AxleConfig_8x2,
Articulated = false,
- FloorType = FloorType.LowFloor,
DoubleDecker = false
};
var segment = DeclarationData.PrimaryBusSegments.Lookup(
- vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated, vehicleData.FloorType);
+ vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated);
Assert.AreEqual(10, segment.Missions.Length);
Assert.AreEqual(VehicleClass.ClassP37_38, segment.VehicleClass);
@@ -457,20 +453,20 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertMission(
segment.Missions[6],
missionType: MissionType.Interurban,
- cdxA: 4.8,
+ cdxA: 3.6,
length: 15,
width: 2.55,
height: 3.15,
curbMass: 17500,
- refLoad: 5496.6780,
- lowLoad: 1374.16950,
+ refLoad: 4497.282,
+ lowLoad: 1124.3205,
axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
AssertMission(
segment.Missions[7],
missionType: MissionType.Coach,
- cdxA: 4.8,
+ cdxA: 3.6,
length: 15,
width: 2.55,
height: 3.15,
@@ -484,20 +480,20 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertMission(
segment.Missions[8],
missionType: MissionType.Interurban,
- cdxA: 5.4,
+ cdxA: 4.05,
length: 15,
width: 2.55,
height: 3.7,
curbMass: 21200,
- refLoad: 7495.47,
- lowLoad: 1873.86750,
+ refLoad: 6246.225,
+ lowLoad: 1561.55625,
axleWeightDistribution: new[] { 0.214, 0.214, 0.358, 0.214 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
AssertMission(
segment.Missions[9],
missionType: MissionType.Coach,
- cdxA: 5.4,
+ cdxA: 4.05,
length: 15,
width: 2.55,
height: 3.7,
@@ -517,11 +513,10 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
VehicleCategory = VehicleCategory.HeavyBusPrimaryVehicle,
AxleConfiguration = AxleConfiguration.AxleConfig_8x2,
Articulated = true,
- FloorType = FloorType.LowFloor,
DoubleDecker = false
};
var segment = DeclarationData.PrimaryBusSegments.Lookup(
- vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated, vehicleData.FloorType);
+ vehicleData.VehicleCategory, vehicleData.AxleConfiguration, vehicleData.Articulated);
Assert.AreEqual(10, segment.Missions.Length);
Assert.AreEqual(VehicleClass.ClassP39_40, segment.VehicleClass);
@@ -563,20 +558,20 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertMission(
segment.Missions[6],
missionType: MissionType.Interurban,
- cdxA: 4.9,
+ cdxA: 3.68,
length: 21,
width: 2.55,
height: 3.15,
curbMass: 20950,
- refLoad: 7886.538,
- lowLoad: 1971.6345,
+ refLoad: 6452.622,
+ lowLoad: 1613.1555,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
AssertMission(
segment.Missions[7],
missionType: MissionType.Coach,
- cdxA: 4.9,
+ cdxA: 3.68,
length: 21,
width: 2.55,
height: 3.15,
@@ -590,20 +585,20 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
AssertMission(
segment.Missions[8],
missionType: MissionType.Interurban,
- cdxA: 5.5,
+ cdxA: 4.13,
length: 21,
width: 2.55,
height: 3.7,
curbMass: 24600,
- refLoad: 10754.37,
- lowLoad: 2688.5925,
+ refLoad: 8961.975,
+ lowLoad: 2240.49375,
axleWeightDistribution: new[] { 0.200, 0.282, 0.324, 0.194 },
expVehicleEquipment: GetExpectedVehicleEquipment(null, null, null, null)
);
AssertMission(
segment.Missions[9],
missionType: MissionType.Coach,
- cdxA: 5.5,
+ cdxA: 4.13,
length: 21,
width: 2.55,
height: 3.7,
@@ -660,5 +655,51 @@ namespace TUGraz.VectoCore.Tests.Models.Declaration
};
return retVal;
}
+
+ [TestCase(VehicleCode.CE, RegistrationClass.I, 2.134, 2.134),
+ TestCase(VehicleCode.CE, RegistrationClass.II, 2.134, 2.134),
+ TestCase(VehicleCode.CE, RegistrationClass.I_II, 2.134, 2.134),
+ TestCase(VehicleCode.CE, RegistrationClass.A, 2.134, 2.134),
+
+ TestCase(VehicleCode.CF, RegistrationClass.I, 2.134, 1.8),
+ TestCase(VehicleCode.CF, RegistrationClass.II, 2.134, 1.8),
+ TestCase(VehicleCode.CF, RegistrationClass.I_II, 2.134, 1.8),
+ TestCase(VehicleCode.CF, RegistrationClass.A, 2.134, 1.8),
+
+ TestCase(VehicleCode.CI, RegistrationClass.I, 2.134, 2.134),
+ TestCase(VehicleCode.CI, RegistrationClass.II, 2.134, 2.134),
+ TestCase(VehicleCode.CI, RegistrationClass.I_II, 2.134, 2.134),
+ TestCase(VehicleCode.CI, RegistrationClass.A, 2.134, 2.134),
+ TestCase(VehicleCode.CI, RegistrationClass.II_III, 2.134, 2.134),
+ TestCase(VehicleCode.CI, RegistrationClass.III, 2.134, 2.134),
+ TestCase(VehicleCode.CI, RegistrationClass.B, 2.134, 2.134),
+
+ TestCase(VehicleCode.CJ, RegistrationClass.I, 2.134, 1.8),
+ TestCase(VehicleCode.CJ, RegistrationClass.II, 2.134, 1.8),
+ TestCase(VehicleCode.CJ, RegistrationClass.I_II, 2.134, 1.8),
+ TestCase(VehicleCode.CJ, RegistrationClass.A, 2.134, 1.8),
+ TestCase(VehicleCode.CJ, RegistrationClass.II_III, 2.134, 1.8),
+ TestCase(VehicleCode.CJ, RegistrationClass.III, 2.134, 1.8),
+ TestCase(VehicleCode.CJ, RegistrationClass.B, 2.134, 1.8),
+
+ TestCase(VehicleCode.CA, RegistrationClass.II, 2.134, 2.134 - 0.5),
+ TestCase(VehicleCode.CA, RegistrationClass.II_III, 2.134, 2.134 - 0.5),
+ TestCase(VehicleCode.CA, RegistrationClass.II_III, 3.134, 1.8),
+ TestCase(VehicleCode.CA, RegistrationClass.III, 2.134, 1.8),
+ TestCase(VehicleCode.CA, RegistrationClass.B, 2.134, 1.8),
+
+ TestCase(VehicleCode.CB, RegistrationClass.II, 2.134, 1.8),
+ TestCase(VehicleCode.CB, RegistrationClass.II_III, 2.134, 1.8),
+ TestCase(VehicleCode.CB, RegistrationClass.III, 2.134, 1.8),
+ TestCase(VehicleCode.CB, RegistrationClass.B, 2.134, 1.8),
+ ]
+ public void TestInternalHeightCalculation(
+ VehicleCode vehicleCode, RegistrationClass regClass, double bodyHeight, double expectedInternalHeight)
+ {
+ var internalHeight =
+ DeclarationData.BusAuxiliaries.CalculateInternalHeight(vehicleCode, regClass, bodyHeight.SI<Meter>());
+
+ Assert.AreEqual(expectedInternalHeight, internalHeight.Value(), 1e-6);
+ }
}
}
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml
index 1b50024a9241f088c9deba463f4d1936e2a9357d..ac9f3cfbe8a7f6c38f5c17939fc9aad27d5c191c 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
- <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-3c3a0ed335444192bea8">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-b66632d98e664d6dbd52">
<Vehicle xsi:type="VehiclePIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
@@ -10,7 +10,7 @@
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
- <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
+ <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>700</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
@@ -214,13 +214,13 @@
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-2f5cc7aab2544f56ae73">
+ <di:Reference URI="#RESULT-1bb8e1c4d2a0410db8a3">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>bOrQ6bQixJt5hoaDBGcf49dOqY2XRBZ0mhKqXzuO+Ok=</di:DigestValue>
+ <di:DigestValue>q8w0EqfrChDsGxMmi8D9CZEYMauwImko53TfPFwdaTc=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -235,9 +235,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.12292</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.73851</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1621.7</CO2>
+ <CO2 unit="g/km">1520.18</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -249,9 +249,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">26.33759</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">24.94611</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1930.6</CO2>
+ <CO2 unit="g/km">1828.60</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -263,9 +263,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.87775</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.93598</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1310.5</CO2>
+ <CO2 unit="g/km">1241.44</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -277,9 +277,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">21.34392</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.36950</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1564.6</CO2>
+ <CO2 unit="g/km">1493.13</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -291,9 +291,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.88888</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.03487</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1164.7</CO2>
+ <CO2 unit="g/km">1102.09</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -305,9 +305,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.06094</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">18.14589</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1397.2</CO2>
+ <CO2 unit="g/km">1330.13</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -319,9 +319,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.57521</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">21.81903</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1654.8</CO2>
+ <CO2 unit="g/km">1599.38</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -333,9 +333,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">26.99415</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">26.59833</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1978.7</CO2>
+ <CO2 unit="g/km">1949.71</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -347,9 +347,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">18.32938</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.82311</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1343.6</CO2>
+ <CO2 unit="g/km">1306.47</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -361,9 +361,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">21.95764</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">21.69768</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1609.5</CO2>
+ <CO2 unit="g/km">1590.49</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -375,9 +375,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.41503</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.74932</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1203.3</CO2>
+ <CO2 unit="g/km">1154.46</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -389,37 +389,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.70852</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.17775</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1444.7</CO2>
+ <CO2 unit="g/km">1405.77</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
- <Payload unit="kg">1075.44</Payload>
- <PassengerCount>15.15</PassengerCount>
+ <TotalVehicleMass unit="kg">14029.90</TotalVehicleMass>
+ <Payload unit="kg">879.90</Payload>
+ <PassengerCount>12.39</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.95443</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.07930</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1022.9</CO2>
+ <CO2 unit="g/km">958.74</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">17451.75</TotalVehicleMass>
- <Payload unit="kg">4301.75</Payload>
- <PassengerCount>60.59</PassengerCount>
+ <TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
+ <Payload unit="kg">3519.61</Payload>
+ <PassengerCount>49.57</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.69902</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.54412</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1150.8</CO2>
+ <CO2 unit="g/km">1066.11</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
@@ -431,9 +431,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.00564</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.13867</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">880.0</CO2>
+ <CO2 unit="g/km">816.49</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
@@ -445,37 +445,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.43599</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.58643</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">911.6</CO2>
+ <CO2 unit="g/km">849.31</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
- <Payload unit="kg">1262.82</Payload>
- <PassengerCount>17.79</PassengerCount>
+ <TotalVehicleMass unit="kg">14452.35</TotalVehicleMass>
+ <Payload unit="kg">1052.35</Payload>
+ <PassengerCount>14.82</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.32957</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.50960</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1050.4</CO2>
+ <CO2 unit="g/km">990.28</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">18451.30</TotalVehicleMass>
- <Payload unit="kg">5051.30</Payload>
- <PassengerCount>71.15</PassengerCount>
+ <TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
+ <Payload unit="kg">4209.41</Payload>
+ <PassengerCount>59.29</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.30992</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.22020</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1195.6</CO2>
+ <CO2 unit="g/km">1115.67</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
@@ -487,9 +487,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.52741</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.61807</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">918.3</CO2>
+ <CO2 unit="g/km">851.63</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
@@ -501,24 +501,24 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.01279</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.15012</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">953.9</CO2>
+ <CO2 unit="g/km">890.63</CO2>
</Result>
</Results>
<ApplicationInformation>
- <SimulationToolVersion>0.6.1.1932-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-04-27T15:04:22.0809726Z</Date>
+ <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2020-05-27T08:30:56.6379619Z</Date>
</ApplicationInformation>
</pif:Data>
<pif:Signature>
- <di:Reference URI="#PIF-3c3a0ed335444192bea8">
+ <di:Reference URI="#PIF-b66632d98e664d6dbd52">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>4feqZKffRbmushwCdq9Rz1vO+NRc5prQhCGvhbjovVM=</di:DigestValue>
+ <di:DigestValue>HjEp4pTd8F+QDECiVrVjac82ZOZfroNGuuFa402/g5o=</di:DigestValue>
</di:Reference>
</pif:Signature>
</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_PIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_PIF.xml
index 2560c2115ec9cc56e6a8fca6bca5bcf802ff30a5..a9dae859f7c96fdf6b209875c2da49b72058a26a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_PIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_PIF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
- <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-b38afb14ebf64d7b9994">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-6a5569db11a945838dc1">
<Vehicle xsi:type="VehiclePIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
@@ -10,7 +10,7 @@
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
- <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
+ <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>700</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
@@ -201,13 +201,13 @@
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-401fc11dff10458fa7d3">
+ <di:Reference URI="#RESULT-b179d11d5b8d4a52ad15">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>G6pV7UUBa4Tu2R2azvxxI+Xwrk+EUmpwlWfLnrUgelU=</di:DigestValue>
+ <di:DigestValue>2sGYw3lvBxp6fLyXRxPkuGM7C3ZMS6R2Y4GIoiO6JVc=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -222,9 +222,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">23.97504</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.31983</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1757.4</CO2>
+ <CO2 unit="g/km">1636.09</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -236,9 +236,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">28.62965</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">26.95463</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">2098.6</CO2>
+ <CO2 unit="g/km">1975.83</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -250,9 +250,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.01393</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.92708</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1393.8</CO2>
+ <CO2 unit="g/km">1314.09</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -264,9 +264,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.79643</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">21.70502</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1671.0</CO2>
+ <CO2 unit="g/km">1591.02</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -278,9 +278,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.38848</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.43924</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1201.3</CO2>
+ <CO2 unit="g/km">1131.73</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -292,9 +292,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.63719</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">18.60503</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1439.4</CO2>
+ <CO2 unit="g/km">1363.79</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -306,9 +306,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">24.45016</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">23.49056</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1792.2</CO2>
+ <CO2 unit="g/km">1721.91</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -320,9 +320,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">29.32238</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">28.74258</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">2149.4</CO2>
+ <CO2 unit="g/km">2106.89</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -334,9 +334,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.47331</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">18.83855</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1427.4</CO2>
+ <CO2 unit="g/km">1380.91</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -348,9 +348,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">23.45718</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">23.12983</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1719.5</CO2>
+ <CO2 unit="g/km">1695.47</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -362,9 +362,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.90512</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.15304</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1239.2</CO2>
+ <CO2 unit="g/km">1184.05</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -376,37 +376,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">20.27630</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.66023</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1486.3</CO2>
+ <CO2 unit="g/km">1441.14</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
- <Payload unit="kg">1075.44</Payload>
- <PassengerCount>15.15</PassengerCount>
+ <TotalVehicleMass unit="kg">14029.90</TotalVehicleMass>
+ <Payload unit="kg">879.90</Payload>
+ <PassengerCount>12.39</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.32222</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.35279</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1049.8</CO2>
+ <CO2 unit="g/km">978.79</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">17451.75</TotalVehicleMass>
- <Payload unit="kg">4301.75</Payload>
- <PassengerCount>60.59</PassengerCount>
+ <TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
+ <Payload unit="kg">3519.61</Payload>
+ <PassengerCount>49.57</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.26264</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.04580</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1192.1</CO2>
+ <CO2 unit="g/km">1102.89</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
@@ -418,9 +418,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.16119</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.27604</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">891.4</CO2>
+ <CO2 unit="g/km">826.56</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
@@ -432,37 +432,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.60476</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.75632</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">924.0</CO2>
+ <CO2 unit="g/km">861.76</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
- <Payload unit="kg">1262.82</Payload>
- <PassengerCount>17.79</PassengerCount>
+ <TotalVehicleMass unit="kg">14452.35</TotalVehicleMass>
+ <Payload unit="kg">1052.35</Payload>
+ <PassengerCount>14.82</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.72559</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.89753</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1079.4</CO2>
+ <CO2 unit="g/km">1018.72</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">18451.30</TotalVehicleMass>
- <Payload unit="kg">5051.30</Payload>
- <PassengerCount>71.15</PassengerCount>
+ <TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
+ <Payload unit="kg">4209.41</Payload>
+ <PassengerCount>59.29</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.92556</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.76592</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1240.7</CO2>
+ <CO2 unit="g/km">1155.67</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
@@ -474,9 +474,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.68026</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.77104</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">929.5</CO2>
+ <CO2 unit="g/km">862.84</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
@@ -488,24 +488,24 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.20667</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.34058</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">968.1</CO2>
+ <CO2 unit="g/km">904.59</CO2>
</Result>
</Results>
<ApplicationInformation>
- <SimulationToolVersion>0.6.1.1932-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-04-27T15:20:47.5882303Z</Date>
+ <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2020-05-27T08:49:59.2317847Z</Date>
</ApplicationInformation>
</pif:Data>
<pif:Signature>
- <di:Reference URI="#PIF-b38afb14ebf64d7b9994">
+ <di:Reference URI="#PIF-6a5569db11a945838dc1">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>jCI3DmkyeDxwqruVCC9WQan2/VSsfuB2fbiGUQH6B+E=</di:DigestValue>
+ <di:DigestValue>OV50jc6Znoit4soReF5N4XdmlHf0/oSjikhS1EgAmJ8=</di:DigestValue>
</di:Reference>
</pif:Signature>
</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_PIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_PIF.xml
index ce14f27e9fb18fe156ec719b6f4b1b7b9c1a4a57..9e7eb94237987075f7ec80ab34068ad68536fbef 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_PIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_PIF.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
- <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-4547e7655ef846a59ce4">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-584956b9e3ab43acaf97">
<Vehicle xsi:type="VehiclePIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
@@ -10,7 +10,7 @@
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>6x2</AxleConfiguration>
<Articulated>false</Articulated>
- <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+ <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
@@ -265,13 +265,13 @@
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-7aec58efb2f74c059ffa">
+ <di:Reference URI="#RESULT-77ea5cb9575a4fe3b401">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>eNjTT9Oy2Bu8HDCg/K+XH4l6Pl2jrlbcifUajMsJ+dA=</di:DigestValue>
+ <di:DigestValue>jIFYjdZEqVpxFinMBSoXvJg8Wl3OjE09xRAnjEgnhhY=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -286,9 +286,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.34507</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">21.22359</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1637.9</CO2>
+ <CO2 unit="g/km">1555.73</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -300,9 +300,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">26.71425</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">25.40945</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1958.2</CO2>
+ <CO2 unit="g/km">1862.57</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -314,9 +314,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.54681</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.74101</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1286.2</CO2>
+ <CO2 unit="g/km">1227.15</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -328,9 +328,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">21.15782</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.24221</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1550.9</CO2>
+ <CO2 unit="g/km">1483.80</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -342,9 +342,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.04555</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.34578</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1102.9</CO2>
+ <CO2 unit="g/km">1051.58</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33SD</VehicleGroup>
@@ -356,9 +356,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">18.39865</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.60016</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1348.7</CO2>
+ <CO2 unit="g/km">1290.13</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -370,9 +370,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">23.09253</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.72091</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1692.7</CO2>
+ <CO2 unit="g/km">1665.49</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -384,9 +384,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">28.09841</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">27.95930</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">2059.7</CO2>
+ <CO2 unit="g/km">2049.48</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -398,9 +398,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">18.21362</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.90756</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1335.1</CO2>
+ <CO2 unit="g/km">1312.66</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -412,9 +412,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.38977</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.23796</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1641.2</CO2>
+ <CO2 unit="g/km">1630.09</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -426,9 +426,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.70160</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.28035</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1151.0</CO2>
+ <CO2 unit="g/km">1120.08</CO2>
</Result>
<Result status="success">
<VehicleGroup>P33DD</VehicleGroup>
@@ -440,37 +440,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.55551</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.26201</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1433.5</CO2>
+ <CO2 unit="g/km">1411.95</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">16467.68</TotalVehicleMass>
- <Payload unit="kg">1254.68</Payload>
- <PassengerCount>17.67</PassengerCount>
+ <TotalVehicleMass unit="kg">16239.55</TotalVehicleMass>
+ <Payload unit="kg">1026.55</Payload>
+ <PassengerCount>14.46</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.58748</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.82464</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">922.7</CO2>
+ <CO2 unit="g/km">866.77</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">20231.71</TotalVehicleMass>
- <Payload unit="kg">5018.71</Payload>
- <PassengerCount>70.69</PassengerCount>
+ <TotalVehicleMass unit="kg">19319.21</TotalVehicleMass>
+ <Payload unit="kg">4106.21</Payload>
+ <PassengerCount>57.83</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.45973</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.32341</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1059.9</CO2>
+ <CO2 unit="g/km">976.63</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
@@ -482,11 +482,11 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">9.48143</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">8.71847</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">695.0</CO2>
+ <CO2 unit="g/km">639.08</CO2>
</Result>
- <Result status="error">
+ <Result status="success">
<VehicleGroup>P34SD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
@@ -495,52 +495,40 @@
<PassengerCount>44.98</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <!-- Test using PIF where not all results are present
- <Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">9.96560</EnergyConsumption>
+ <Fuel type="Diesel CI">
+ <EnergyConsumption unit="MJ/km">9.20255</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">730.5</CO2>
- -->
- <Error>20 (Coach _P40DD_ReferenceLoad) - absTime: 7535.2269 [s], distance: 130338.3598 [m], dt: 0.6304 [s], v: 0.0141 [m/s], Gear: 1 | DrivingActionAccelerate: Failed to find operating point</Error>
- <ErrorDetails>String</ErrorDetails>
+ <CO2 unit="g/km">674.57</CO2>
</Result>
- <Result status="error">
+ <Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">19588.08</TotalVehicleMass>
- <Payload unit="kg">1738.08</Payload>
- <PassengerCount>24.48</PassengerCount>
+ <TotalVehicleMass unit="kg">19298.40</TotalVehicleMass>
+ <Payload unit="kg">1448.40</Payload>
+ <PassengerCount>20.40</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <!-- Test using PIF where not all results are present
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.24030</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.44807</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1043.8</CO2>
- -->
- <Error>20 (Coach _P40DD_ReferenceLoad) - absTime: 7535.2269 [s], distance: 130338.3598 [m], dt: 0.6304 [s], v: 0.0141 [m/s], Gear: 1 | DrivingActionAccelerate: Failed to find operating point</Error>
- <ErrorDetails>String</ErrorDetails>
+ <CO2 unit="g/km">985.77</CO2>
</Result>
- <Result status="error">
+ <Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">24802.32</TotalVehicleMass>
- <Payload unit="kg">6952.32</Payload>
- <PassengerCount>97.92</PassengerCount>
+ <TotalVehicleMass unit="kg">23643.60</TotalVehicleMass>
+ <Payload unit="kg">5793.60</Payload>
+ <PassengerCount>81.60</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <!-- Test using PIF where not all results are present
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.77091</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.56740</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1229.3</CO2>
- -->
- <Error>20 (Coach _P40DD_ReferenceLoad) - absTime: 7535.2269 [s], distance: 130338.3598 [m], dt: 0.6304 [s], v: 0.0141 [m/s], Gear: 1 | DrivingActionAccelerate: Failed to find operating point</Error>
- <ErrorDetails>String</ErrorDetails>
+ <CO2 unit="g/km">1141.12</CO2>
</Result>
- <Result status="error">
+ <Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
<Mission>Coach</Mission>
<SimulationParameters>
@@ -550,9 +538,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">10.63937</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">9.82937</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">779.9</CO2>
+ <CO2 unit="g/km">720.51</CO2>
</Result>
<Result status="success">
<VehicleGroup>P34DD</VehicleGroup>
@@ -563,29 +551,25 @@
<PassengerCount>65.28</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
- <!-- Test using PIF where not all results are present
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">11.34890</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">10.56728</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">831.9</CO2>
- -->
- <Error>20 (Coach _P40DD_ReferenceLoad) - absTime: 7535.2269 [s], distance: 130338.3598 [m], dt: 0.6304 [s], v: 0.0141 [m/s], Gear: 1 | DrivingActionAccelerate: Failed to find operating point</Error>
- <ErrorDetails>String</ErrorDetails>
+ <CO2 unit="g/km">774.60</CO2>
</Result>
</Results>
<ApplicationInformation>
- <SimulationToolVersion>0.6.1.1932-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-04-27T15:27:55.0235083Z</Date>
+ <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2020-05-27T08:16:48.0278823Z</Date>
</ApplicationInformation>
</pif:Data>
<pif:Signature>
- <di:Reference URI="#PIF-4547e7655ef846a59ce4">
+ <di:Reference URI="#PIF-584956b9e3ab43acaf97">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>Bd6+KBNxRH+VvltBoDPg1kX8DVKHlMClWX6SOQjV9Nc=</di:DigestValue>
+ <di:DigestValue>GPW3cyV+VQrDzyGeryMrakfOlD+YUWtdaHz/C2lhxJQ=</di:DigestValue>
</di:Reference>
</pif:Signature>
</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml
index cbffa8c530e3bc08935b41b8a65b1ee5b1edc175..e24f678131a7411aa05c1a96c3e96a29ab0ce202 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_PIF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
- <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-ee3fb48489044a79a1ed">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-65de7efe65ee4b4cac4c">
<Vehicle xsi:type="VehiclePIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
@@ -10,7 +10,7 @@
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
- <TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
+ <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>600</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
@@ -236,13 +236,13 @@
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-54f0b68e380a4fa3abe0">
+ <di:Reference URI="#RESULT-bc20a2dbfee54190ae90">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>f+tMDAgSLYwGqTWDD34xLNT8wHyy/8E9frPGKdSKEX0=</di:DigestValue>
+ <di:DigestValue>+0Hg3i3G7tHlYHM2JxapJje6Ca3nE5EXZVTNdgkeyMo=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -257,9 +257,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">18.84546</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.81185</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1056.1</CO2>
+ <CO2 unit="g/km">998.21</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -271,9 +271,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">22.54566</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">21.37501</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1263.5</CO2>
+ <CO2 unit="g/km">1197.89</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -285,9 +285,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">15.14071</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.37972</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">848.5</CO2>
+ <CO2 unit="g/km">805.86</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -299,9 +299,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">18.22196</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.36588</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1021.2</CO2>
+ <CO2 unit="g/km">973.21</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -313,9 +313,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">13.37478</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.72559</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">749.5</CO2>
+ <CO2 unit="g/km">713.16</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -327,9 +327,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">16.31513</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.58182</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">914.3</CO2>
+ <CO2 unit="g/km">873.23</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -341,9 +341,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">19.24449</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">18.89946</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1078.5</CO2>
+ <CO2 unit="g/km">1059.16</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -355,9 +355,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">23.17053</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">22.89746</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1298.5</CO2>
+ <CO2 unit="g/km">1283.21</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -369,9 +369,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">15.55164</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.23384</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">871.5</CO2>
+ <CO2 unit="g/km">853.73</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -383,9 +383,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">18.79571</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">18.56793</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1053.3</CO2>
+ <CO2 unit="g/km">1040.58</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -397,9 +397,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">13.83562</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.41841</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">775.4</CO2>
+ <CO2 unit="g/km">751.99</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -411,37 +411,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">16.93966</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.61045</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">949.3</CO2>
+ <CO2 unit="g/km">930.88</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
- <Payload unit="kg">1075.44</Payload>
- <PassengerCount>15.15</PassengerCount>
+ <TotalVehicleMass unit="kg">14029.90</TotalVehicleMass>
+ <Payload unit="kg">879.90</Payload>
+ <PassengerCount>12.39</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">11.65585</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">10.88604</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">653.2</CO2>
+ <CO2 unit="g/km">610.07</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">17451.75</TotalVehicleMass>
- <Payload unit="kg">4301.75</Payload>
- <PassengerCount>60.59</PassengerCount>
+ <TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
+ <Payload unit="kg">3519.61</Payload>
+ <PassengerCount>49.57</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">13.34146</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.24260</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">747.7</CO2>
+ <CO2 unit="g/km">686.10</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
@@ -453,9 +453,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">9.47120</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">8.63290</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">530.8</CO2>
+ <CO2 unit="g/km">483.80</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
@@ -467,37 +467,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">9.91693</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">9.09409</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">555.8</CO2>
+ <CO2 unit="g/km">509.65</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
- <Payload unit="kg">1262.82</Payload>
- <PassengerCount>17.79</PassengerCount>
+ <TotalVehicleMass unit="kg">14452.35</TotalVehicleMass>
+ <Payload unit="kg">1052.35</Payload>
+ <PassengerCount>14.82</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">11.98595</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.25244</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">671.7</CO2>
+ <CO2 unit="g/km">630.61</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">18451.30</TotalVehicleMass>
- <Payload unit="kg">5051.30</Payload>
- <PassengerCount>71.15</PassengerCount>
+ <TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
+ <Payload unit="kg">4209.41</Payload>
+ <PassengerCount>59.29</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">13.94106</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.91147</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">781.3</CO2>
+ <CO2 unit="g/km">723.58</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
@@ -509,9 +509,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">9.98110</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">9.09497</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">559.4</CO2>
+ <CO2 unit="g/km">509.70</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
@@ -523,24 +523,24 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
- <EnergyConsumption unit="MJ/km">10.51592</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">9.65550</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">589.3</CO2>
+ <CO2 unit="g/km">541.11</CO2>
</Result>
</Results>
<ApplicationInformation>
- <SimulationToolVersion>0.6.1.1932-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-04-27T15:40:40.3451077Z</Date>
+ <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2020-05-27T08:24:31.2197913Z</Date>
</ApplicationInformation>
</pif:Data>
<pif:Signature>
- <di:Reference URI="#PIF-ee3fb48489044a79a1ed">
+ <di:Reference URI="#PIF-65de7efe65ee4b4cac4c">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>+FxZ1z90Juhoj0n67kA6amYCq4x8g/q81lomEk0LK2k=</di:DigestValue>
+ <di:DigestValue>MgGDNMXm8x2CI30U7X27ZFWn9cqjTnylZGA0nHA6xtM=</di:DigestValue>
</di:Reference>
</pif:Signature>
</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
index 6612868f9d92f1ebbdda142166494cf1a7b2c4a5..6884c390d8779cc9d9806f91bd5ad6897cda8a4e 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeed.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-170-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8291,46.6396,15.8669,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,0.0000,0.0000,7792.4340,167.0777,7792.4340,167.0777,19.9854,,,,186.2516,522.9532,,,,27.2064,37.7900,13.6359,0.2221,0.0000,1.9832,1.9832,0.0071,0.0000,0.0000,0.3147,0.0000,0.0000,1.8487,0.4618,0.0000,5.3307,3.1079,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3207,-0.3296,23.1717,22.7868,39.6459,80.5095,1.1306,1.6261,1122.2095,1796.5316,26.0000,14.3957,5.0038,0.0000,39.9538,0.2852,N/A,0.408863773774677,,,,,NOT CERTIFIED,N/A,0.97524591089198,,,,,,NOT CERTIFIED,N/A,0.859488809846564,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.0377,20.4003
-#@ SHA256: mzem3WcWeHHsT/YZzxyG/K1+x5TKGxDcSkhhGDG9XhQ=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:58
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+182-0,MeasuredSpeed,MeasuredSpeed.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8291,46.6396,15.8669,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,7792.4340,167.0777,0.0000,0.0000,7792.4340,167.0777,7792.4340,167.0777,19.9854,,,,203.4486,186.2516,522.9532,,,,24.3832,27.2064,37.1745,37.7900,13.6359,0.2221,0.0000,1.9832,1.9832,0.0071,0.0000,0.0000,0.3147,0.0000,0.0000,1.8487,0.4618,0.0000,5.3307,3.1079,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3207,-0.3296,23.1717,22.7868,39.6459,80.5095,1.1306,1.6261,1122.2095,1796.5316,26.0000,14.3957,5.0038,0.0000,39.9538,0.2852,N/A,0.408863773774671,,,,,NOT CERTIFIED,N/A,0.975245910893873,,,,,,NOT CERTIFIED,N/A,0.859488809846527,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.0377,20.4003
+#@ SHA256: d3KZ+LY2yfVpCYnzKUX0O0k2XPhhJzAxVqt58OwXs6c=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
index 479beb1f3bb7ef68c61c64948d443580f5809d03..49b642078e875a87d104b553d8cc6c3fc4411581 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-171-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8272,46.6344,15.8669,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,0.0000,0.0000,7969.6084,170.8956,7969.6084,170.8956,20.4421,,,,186.4911,534.9033,,,,27.2016,38.7492,13.9820,0.2060,0.0000,1.9832,0.3799,2.3631,0.0070,0.0000,0.0000,0.3147,0.0000,0.0000,1.8485,0.4461,0.0000,5.3293,3.1075,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3192,-0.3296,23.3256,22.7868,39.4919,80.5095,1.1306,1.6261,1121.8867,1796.5316,26.0000,14.3957,5.1578,0.0000,39.9538,0.2805,N/A,0.409921623948621,,,,,NOT CERTIFIED,N/A,0.975246396552834,,,,,,NOT CERTIFIED,N/A,0.859479878569242,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.0377,20.4003
-#@ SHA256: EkKaRRIL7DHlWJIJE/Am9ao0RDYPQbdnpldhoESN0JA=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:58
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+183-0,MeasuredSpeedAux,MeasuredSpeedAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8272,46.6344,15.8669,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,7969.6084,170.8956,0.0000,0.0000,7969.6084,170.8956,7969.6084,170.8956,20.4421,,,,204.1173,186.4911,534.9033,,,,24.3784,27.2016,38.1783,38.7492,13.9820,0.2060,0.0000,1.9832,0.3799,2.3631,0.0070,0.0000,0.0000,0.3147,0.0000,0.0000,1.8485,0.4461,0.0000,5.3293,3.1075,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3192,-0.3296,23.3256,22.7868,39.4919,80.5095,1.1306,1.6261,1121.8867,1796.5316,26.0000,14.3957,5.1578,0.0000,39.9538,0.2805,N/A,0.40992162394878,,,,,NOT CERTIFIED,N/A,0.975246396559554,,,,,,NOT CERTIFIED,N/A,0.859479878569248,N/A,NOT CERTIFIED,16.8591,7.6982,0.7698,1.0778,4.1570,49.0377,20.4003
+#@ SHA256: sZ58ZsQGHucswGmomwc7XLOOCAw+pJ6/UDd3lcLMymY=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
index e3a141eb4cb8224199dc7d8279b623f95c700b47..4b51deeb81067a42ad32e5f9dd25274800ac8be1 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-166-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8712,46.7563,15.8669,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,0.0000,0.0000,7798.8920,166.7987,7798.8920,166.7987,19.9520,,,,185.9065,522.0799,,,,27.2335,37.7843,13.6338,0.1855,0.0000,1.9832,1.9832,0.0227,0.0000,0.0000,0.3225,0.0000,0.0000,1.8506,0.4425,0.0000,5.3535,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3070,-0.3441,23.5566,21.4011,40.6467,80.5095,1.4057,1.9402,1082.0265,1962.3354,23.0000,14.3957,3.3872,0.0000,40.1848,0.2677,N/A,0.40846343437036,,,,,NOT CERTIFIED,N/A,0.974391308464304,,,,,,NOT CERTIFIED,N/A,0.857838912545838,N/A,NOT CERTIFIED,14.3957,1.7706,7.2363,1.6166,1.6936,49.9615,23.3256
-#@ SHA256: VOeWsLehPtAX3WGhAE0w9AaF6WdOzlGedeS7WAsZMZg=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:57
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+178-0,MeasuredSpeedGear,MeasuredSpeed_Gear_Rural.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8712,46.7563,15.8669,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,7798.8920,166.7987,0.0000,0.0000,7798.8920,166.7987,7798.8920,166.7987,19.9520,,,,208.0220,185.9065,522.0799,,,,24.4682,27.2335,37.2702,37.7843,13.6338,0.1855,0.0000,1.9832,1.9832,0.0227,0.0000,0.0000,0.3225,0.0000,0.0000,1.8506,0.4425,0.0000,5.3535,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3070,-0.3441,23.5566,21.4011,40.6467,80.5095,1.4057,1.9402,1082.0265,1962.3354,23.0000,14.3957,3.3872,0.0000,40.1848,0.2677,N/A,0.408463434370422,,,,,NOT CERTIFIED,N/A,0.974391308464303,,,,,,NOT CERTIFIED,N/A,0.857838912545851,N/A,NOT CERTIFIED,14.3957,1.7706,7.2363,1.6166,1.6936,49.9615,23.3256
+#@ SHA256: rrG0A8jnb20xXESokBmtaSAHa8/qKz8W+Rrpz6B7Iq8=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
index 030a82cdc99d6aae2657fa3a4fc19cc3e78f56d3..bc4219c904bbc1510cf54ca8a7af13d27c185a7d 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-PS.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%]
-163-0,MeasuredSpeedGearAT-PS,MeasuredSpeedGear_AT-PS.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATPowerSplit,1.3500,0.7300,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,5.8000,,,,,,,0,,,,379.0000,2.8864,27.4168,0.0036,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,0.0000,0.0000,10195.7876,371.8816,10195.7876,371.8816,44.4834,9.2674,,,172.2255,1163.9895,242.4978,,,40.8256,50.2341,5.2885,0.3358,0.0000,0.4738,0.4738,0.0000,0.0000,5.1676,0.2366,0.0000,0.0000,0.0960,2.6222,-0.0001,0.2436,1.0118,0.0002,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0004,0.6313,-0.8532,32.7177,24.0106,23.2190,60.3000,1.1111,1.6111,952.4879,1538.8058,25.0000,20.0528,0.0000,0.0000,33.7731,0.0000,N/A,0.415386683898571,Standard values,,0.944294049232961,0,NOT CERTIFIED,N/A,0.95440400876431,,,,,,NOT CERTIFIED,N/A,0.980000000000001,N/A,NOT CERTIFIED,26.3852,20.3166,11.6095,41.6887
-#@ SHA256: XAMYw7SOH2BuZzIpTQtUcYQEmj6POn8s8h1L75B22Wc=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:57
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%]
+175-0,MeasuredSpeedGearAT-PS,MeasuredSpeedGear_AT-PS.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATPowerSplit,1.3500,0.7300,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,5.8000,,,,,,,0,,,,379.0000,2.8864,27.4168,0.0036,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,10195.7876,371.8816,0.0000,0.0000,10195.7876,371.8816,10195.7876,371.8816,44.4834,9.2674,,,113.8965,172.2255,1163.9895,242.4978,,,11.9262,40.8256,47.0440,50.2341,5.2885,0.3358,0.0000,0.4738,0.4738,0.0000,0.0000,5.1676,0.2366,0.0000,0.0000,0.0960,2.6222,-0.0001,0.2436,1.0118,0.0002,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0004,0.6313,-0.8532,32.7177,24.0106,23.2190,60.3000,1.1111,1.6111,952.4879,1538.8058,25.0000,20.0528,0.0000,0.0000,33.7731,0.0000,N/A,0.415386683898571,Standard values,,0.944294049232961,0,NOT CERTIFIED,N/A,0.95440400876431,,,,,,NOT CERTIFIED,N/A,0.980000000000001,N/A,NOT CERTIFIED,26.3852,20.3166,11.6095,41.6887
+#@ SHA256: 2+C1ckHuhoevzEK5uwqKeQo3iITZEFSg5rqbAIU2Pqs=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
index 4ba11190f198d82d547c57f6ed7e21cc7b66c61a..194ba460760bd4de9eea8a65a0f9c8a51fb4606d 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAT-Ser.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-164-0,MeasuredSpeedGearAT-Ser,MeasuredSpeedGear_AT-Ser.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATSerial,3.4000,0.6200,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,6.2000,,,,,,,0,,,,272.0000,1.0234,13.5450,-0.0054,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,0.0000,0.0000,7363.9257,543.6627,7363.9257,543.6627,65.0314,13.5482,,,177.8046,1701.6644,354.5134,,,23.2896,32.9224,2.4875,0.3422,0.0000,0.3400,0.3400,0.0000,0.0000,21.0166,0.3905,0.0000,0.0000,0.0450,0.9481,0.0000,0.0338,0.3587,-0.0001,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0002,0.8771,-0.7766,22.4265,25.0000,18.7500,40.6000,1.6935,1.3056,979.1873,1857.4892,45.0000,33.8235,1.4706,0.0000,33.4559,0.5574,N/A,0.376927083000462,Standard values,,0.984236793781103,0,NOT CERTIFIED,N/A,0.843126167087998,,,,,,NOT CERTIFIED,N/A,0.979999999999999,N/A,NOT CERTIFIED,33.8235,24.6324,8.0882,14.7059,13.6029,5.1471,0.0000
-#@ SHA256: MQo66fF78DOvgGEauxpeRPxZBZqx6E3Fn6Mh/q6d5O4=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:57
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+176-0,MeasuredSpeedGearAT-Ser,MeasuredSpeedGear_AT-Ser.vdri,Success,N/A,,N/A,-,17000.0000,4800.0000,,21800.0000,N/A,Generic Engine,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2500,no,0.0058,26265.0000,0.0058,26265.0000,0.0058,26265.0000,,,0.00590364808199548,0.00590364808199548,0.4700,1,2,0,N/A,AT Serial,ATSerial,3.4000,0.6200,,,N/A,N/A,None,N/A,N/A,N/A,N/A,AT Serial,6.2000,,,,,,,0,,,,272.0000,1.0234,13.5450,-0.0054,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,7363.9257,543.6627,0.0000,0.0000,7363.9257,543.6627,7363.9257,543.6627,65.0314,13.5482,,,172.6332,177.8046,1701.6644,354.5134,,,5.1930,23.2896,28.3939,32.9224,2.4875,0.3422,0.0000,0.3400,0.3400,0.0000,0.0000,21.0166,0.3905,0.0000,0.0000,0.0450,0.9481,0.0000,0.0338,0.3587,-0.0001,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,-0.0002,0.8771,-0.7766,22.4265,25.0000,18.7500,40.6000,1.6935,1.3056,979.1873,1857.4892,45.0000,33.8235,1.4706,0.0000,33.4559,0.5574,N/A,0.376927083000462,Standard values,,0.984236793781103,0,NOT CERTIFIED,N/A,0.843126167088011,,,,,,NOT CERTIFIED,N/A,0.979999999999999,N/A,NOT CERTIFIED,33.8235,24.6324,8.0882,14.7059,13.6029,5.1471,0.0000
+#@ SHA256: r2Ucz8L1i0p91c7uUfDsoBmyJG6q7+evKn+/dto47Hk=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
index 172e17cdf7abf9bc6377121439ac48df539ffab6..7e5cffdda6ffa84259e3a606774546069b1a9651 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-165-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,1299.0000,16.8692,46.7506,15.8669,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,0.0000,0.0000,7952.3773,170.1021,7952.3773,170.1021,20.3471,,,,186.9375,532.4196,,,,27.2199,38.7272,13.9741,0.1710,0.0000,1.9829,0.3775,2.3604,0.0227,0.0000,0.0000,0.3284,0.0000,0.0000,1.8503,0.4150,0.0000,5.3532,3.1153,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3034,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.0085,1962.3354,24.0000,14.3957,3.4642,0.0000,40.1848,0.2560,N/A,0.410575873210009,,,,,NOT CERTIFIED,N/A,0.974385958482671,,,,,,NOT CERTIFIED,N/A,0.857785140124264,N/A,NOT CERTIFIED,14.8576,1.6166,7.5443,1.2317,2.1555,49.2687,23.3256
-#@ SHA256: 1tRo6L7FtwLxzChzaZLRjkrfIAcn0lDIkk4bASaZpzY=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:57
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+177-0,MeasuredSpeedGearAux,MeasuredSpeed_Gear_Rural_Aux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,1299.0000,16.8692,46.7506,15.8669,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,7952.3773,170.1021,0.0000,0.0000,7952.3773,170.1021,7952.3773,170.1021,20.3471,,,,209.5481,186.9375,532.4196,,,,24.4663,27.2199,38.2533,38.7272,13.9741,0.1710,0.0000,1.9829,0.3775,2.3604,0.0227,0.0000,0.0000,0.3284,0.0000,0.0000,1.8503,0.4150,0.0000,5.3532,3.1153,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3034,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.0085,1962.3354,24.0000,14.3957,3.4642,0.0000,40.1848,0.2560,N/A,0.410575873210116,,,,,NOT CERTIFIED,N/A,0.97438595848267,,,,,,NOT CERTIFIED,N/A,0.857785140124247,N/A,NOT CERTIFIED,14.8576,1.6166,7.5443,1.2317,2.1555,49.2687,23.3256
+#@ SHA256: bHv24J42Uc/bKURFf8SiqzUTZbiEXJyHYkFTsDNGyM4=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
index 3708ee2786053d455f299c08da2b5f92f47d8689..46bec08a3cfb202777c6e685bcbc7ed7d9671e50 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVair.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-168-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8711,46.7558,15.8669,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,0.0000,0.0000,6299.2293,134.7261,6299.2293,134.7261,16.1156,,,,185.0752,421.6927,,,,20.1036,29.8629,10.7755,0.2881,0.0000,1.9832,1.9832,0.0270,0.0000,0.0000,0.2879,0.0000,0.0000,1.8468,0.6441,0.0000,2.2252,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1085.0944,1962.3354,22.0000,14.3957,1.4627,0.0000,40.1848,0.0000,N/A,0.399686339290224,,,,,NOT CERTIFIED,N/A,0.972090004850644,,,,,,NOT CERTIFIED,N/A,0.83229979692195,N/A,NOT CERTIFIED,14.7036,1.6166,7.3903,1.3857,2.0015,49.5766,23.3256
-#@ SHA256: GL+lqiO6qv9wwvBhXGLaM9epqEHlJHjcUU0L8XGcPUI=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:57
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+180-0,MeasuredSpeedGearVair,MeasuredSpeed_Gear_Rural_Vair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8711,46.7558,15.8669,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,6299.2293,134.7261,0.0000,0.0000,6299.2293,134.7261,6299.2293,134.7261,16.1156,,,,205.5973,185.0752,421.6927,,,,15.7985,20.1036,29.0646,29.8629,10.7755,0.2881,0.0000,1.9832,1.9832,0.0270,0.0000,0.0000,0.2879,0.0000,0.0000,1.8468,0.6441,0.0000,2.2252,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1085.0944,1962.3354,22.0000,14.3957,1.4627,0.0000,40.1848,0.0000,N/A,0.399686339290113,,,,,NOT CERTIFIED,N/A,0.97209000485083,,,,,,NOT CERTIFIED,N/A,0.83229979692204,N/A,NOT CERTIFIED,14.7036,1.6166,7.3903,1.3857,2.0015,49.5766,23.3256
+#@ SHA256: N0/BJKASSuisC2RGZito2kjLLa9lNYOqk5RxrnZGaSU=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
index a2ac3f540527699d3787ac8f26481120705eec51..d41e18113bda6b556d05a4e6c649dcbbe087f1be 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGearVairAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-169-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,1299.0000,16.8711,46.7559,15.8669,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,0.0000,0.0000,6457.4048,138.1088,6457.4048,138.1088,16.5202,,,,185.6690,432.2806,,,,20.1038,30.7900,11.1101,0.2750,0.0000,1.9824,0.3775,2.3598,0.0269,0.0000,0.0000,0.2906,0.0000,0.0000,1.8468,0.6124,0.0000,2.2253,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.1418,1962.3354,23.0000,14.3957,1.6166,0.0000,40.1848,0.0000,N/A,0.402000564697501,,,,,NOT CERTIFIED,N/A,0.972073707982268,,,,,,NOT CERTIFIED,N/A,0.832297265064537,N/A,NOT CERTIFIED,14.9346,1.5396,7.5443,1.2317,2.1555,49.2687,23.3256
-#@ SHA256: K4m4cAq5Ddq8ABJ8s/cSat8xM8VtiK0FAzDlA1XHWlU=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:58
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+181-0,MeasuredSpeedGearVairAux,MeasuredSpeed_Gear_Rural_VairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,,1299.0000,16.8711,46.7559,15.8669,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,6457.4048,138.1088,0.0000,0.0000,6457.4048,138.1088,6457.4048,138.1088,16.5202,,,,206.1477,185.6690,432.2806,,,,15.7988,20.1038,30.0279,30.7900,11.1101,0.2750,0.0000,1.9824,0.3775,2.3598,0.0269,0.0000,0.0000,0.2906,0.0000,0.0000,1.8468,0.6124,0.0000,2.2253,3.1156,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3035,-0.3378,23.4796,21.4781,40.6467,80.5095,1.1306,1.6261,1087.1418,1962.3354,23.0000,14.3957,1.6166,0.0000,40.1848,0.0000,N/A,0.402000564697536,,,,,NOT CERTIFIED,N/A,0.97207370798227,,,,,,NOT CERTIFIED,N/A,0.832297265064532,N/A,NOT CERTIFIED,14.9346,1.5396,7.5443,1.2317,2.1555,49.2687,23.3256
+#@ SHA256: R0yloUzNElSYJdVvJuO0jC53mMQjjQktGpSHA21o1KI=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum
index 6f6c2c33c5d682bd66eb82d6c7d07240399cfcce..df33933df7de9178b68d2065492d0fb8eaac82b4 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedGear_TractionInterruption.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:38
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-167-0,MeasuredSpeedGear_TractionInterruption,MeasuredSpeed_Gear_Rural_TractionInterruption.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8351,46.6562,15.8669,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,0.0000,0.0000,7783.1500,166.8192,7783.1500,166.8192,19.9544,,,,185.6254,522.1440,,,,27.1915,37.6385,13.5812,0.1687,0.0000,1.9832,1.9832,0.0067,0.0000,0.0000,0.3210,0.0000,0.0000,1.8478,0.4698,0.0000,5.3378,3.1090,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3200,-0.3323,22.7868,22.1709,40.6467,80.5095,1.8083,1.6261,1076.6963,1701.8773,22.0000,14.3957,4.3880,0.0000,39.5689,0.2514,N/A,0.407710308187605,,,,,NOT CERTIFIED,N/A,0.974168745926168,,,,,,NOT CERTIFIED,N/A,0.858764390579578,N/A,NOT CERTIFIED,17.4750,1.3087,6.2356,1.3857,1.4627,48.9607,23.1717
-#@ SHA256: iff/z2St64W7hTtQG7qo6IQhVZNU9aWSLHaZiAAuNzE=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:57
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+179-0,MeasuredSpeedGear_TractionInterruption,MeasuredSpeed_Gear_Rural_TractionInterruption.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,,0,,,,1299.0000,16.8351,46.6562,15.8669,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,7783.1500,166.8192,0.0000,0.0000,7783.1500,166.8192,7783.1500,166.8192,19.9544,,,,203.7978,185.6254,522.1440,,,,24.4061,27.1915,37.1709,37.6385,13.5812,0.1687,0.0000,1.9832,1.9832,0.0067,0.0000,0.0000,0.3210,0.0000,0.0000,1.8478,0.4698,0.0000,5.3378,3.1090,0.3598,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3200,-0.3323,22.7868,22.1709,40.6467,80.5095,1.8083,1.6261,1076.6963,1701.8773,22.0000,14.3957,4.3880,0.0000,39.5689,0.2514,N/A,0.40771030818796,,,,,NOT CERTIFIED,N/A,0.974168745921067,,,,,,NOT CERTIFIED,N/A,0.858764390582281,N/A,NOT CERTIFIED,17.4750,1.3087,6.2356,1.3857,1.4627,48.9607,23.1717
+#@ SHA256: 1Aa+uttVouZGyu/2K+6QVA/akk+WVc6b3ukseps6Qz4=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
index 77df3180df3b2fb68ee07ac7277a6e1a1589f0c8..74aa10b306d9aea0a6d61b3ec939bc1dc10a6afc 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVair.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-173-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8420,46.6752,15.8669,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,0.0000,0.0000,6308.6325,135.1604,6308.6325,135.1604,16.1675,,,,184.8872,423.0521,,,,20.1402,29.9124,10.7934,0.3304,0.0000,1.9832,1.9832,0.0082,0.0000,0.0000,0.2780,0.0000,0.0000,1.8453,0.6547,0.0000,2.2238,3.1102,0.3596,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3176,-0.3316,23.0177,22.2479,40.3387,80.5095,1.1306,1.6261,1117.6138,1796.5316,26.0000,14.3957,3.0023,0.0000,39.9538,0.3005,N/A,0.399752328298219,,,,,NOT CERTIFIED,N/A,0.973102441420391,,,,,,NOT CERTIFIED,N/A,0.83441619909227,N/A,NOT CERTIFIED,16.4742,7.9292,0.7698,1.0778,3.4642,49.5766,20.7082
-#@ SHA256: rI9+KYA4eUNsF2dWJLakMeVWvIT6x2BJS91p1qcieeI=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:58
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+185-0,MeasuredSpeedVair,MeasuredSpeedVair.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8420,46.6752,15.8669,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,6308.6325,135.1604,0.0000,0.0000,6308.6325,135.1604,6308.6325,135.1604,16.1675,,,,200.0850,184.8872,423.0521,,,,15.7789,20.1402,28.9967,29.9124,10.7934,0.3304,0.0000,1.9832,1.9832,0.0082,0.0000,0.0000,0.2780,0.0000,0.0000,1.8453,0.6547,0.0000,2.2238,3.1102,0.3596,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3176,-0.3316,23.0177,22.2479,40.3387,80.5095,1.1306,1.6261,1117.6138,1796.5316,26.0000,14.3957,3.0023,0.0000,39.9538,0.3005,N/A,0.39975232829822,,,,,NOT CERTIFIED,N/A,0.973102441420963,,,,,,NOT CERTIFIED,N/A,0.834416199092332,N/A,NOT CERTIFIED,16.4742,7.9292,0.7698,1.0778,3.4642,49.5766,20.7082
+#@ SHA256: 9P2MPeg0cwNNFrABkym0J6hC8JwYPWpjs7fa7qhWzuY=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
index 0b9a300511a03a9a42574a39da4d2f3936867756..8c1a3e1d5143835b33fc08f8321369c5c229086c 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairAux.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-176-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8410,46.6724,15.8669,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,0.0000,0.0000,6477.6109,138.7889,6477.6109,138.7889,16.6015,,,,184.9917,434.4094,,,,20.1395,30.8444,11.1297,0.3136,0.0000,1.9832,0.3795,2.3627,0.0082,0.0000,0.0000,0.2781,0.0000,0.0000,1.8453,0.6286,0.0000,2.2237,3.1100,0.3596,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3177,-0.3316,23.0177,22.2479,40.3387,80.5095,1.1306,1.6261,1117.3974,1796.5316,26.0000,14.3957,3.1563,0.0000,39.9538,0.3014,N/A,0.401454216119916,,,,,NOT CERTIFIED,N/A,0.973103928336166,,,,,,NOT CERTIFIED,N/A,0.834411356629342,N/A,NOT CERTIFIED,16.4742,7.9292,0.7698,1.0778,3.4642,49.5766,20.7082
-#@ SHA256: 6KO6SifwMdJdVcQXp7p0wkj4X67vCgtgKpERWTkMUSE=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:58
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Auxiliary technology ALT [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_ALT [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+188-0,MeasuredSpeedVairAux,MeasuredSpeedVairAux.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,,1299.0000,16.8410,46.6724,15.8669,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,6477.6109,138.7889,0.0000,0.0000,6477.6109,138.7889,6477.6109,138.7889,16.6015,,,,200.4765,184.9917,434.4094,,,,15.7782,20.1395,29.9752,30.8444,11.1297,0.3136,0.0000,1.9832,0.3795,2.3627,0.0082,0.0000,0.0000,0.2781,0.0000,0.0000,1.8453,0.6286,0.0000,2.2237,3.1100,0.3596,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3177,-0.3316,23.0177,22.2479,40.3387,80.5095,1.1306,1.6261,1117.3974,1796.5316,26.0000,14.3957,3.1563,0.0000,39.9538,0.3014,N/A,0.40145421611878,,,,,NOT CERTIFIED,N/A,0.973103928336738,,,,,,NOT CERTIFIED,N/A,0.834411356629346,N/A,NOT CERTIFIED,16.4742,7.9292,0.7698,1.0778,3.4642,49.5766,20.7082
+#@ SHA256: 4kfx6jCqBcHgonJg4S9u4Ld2D73rx9BrxuE4TLUD+yQ=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
index 560fd55fa2607ce4d002f3d4386d610602b1dfaf..fe05e415c406dcc48efbcba595147d8e966dadf4 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairBack.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-174-0,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8487,46.6939,15.8669,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,0.0000,0.0000,4881.4833,104.5421,4881.4833,104.5421,12.5050,,,,181.6952,327.2169,,,,13.7599,22.2872,8.0420,0.5117,0.0000,1.9832,1.9832,0.0065,0.0000,0.0000,0.2508,0.0000,0.0000,1.8435,0.8319,0.0000,-0.8568,3.1115,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3157,-0.3385,22.9407,21.4011,41.2625,80.5095,1.1306,1.6261,1113.9153,1620.3683,22.0000,14.3957,2.3095,0.0000,40.0308,0.3086,N/A,0.384926976360445,,,,,NOT CERTIFIED,N/A,0.970291794115735,,,,,,NOT CERTIFIED,N/A,0.80392961280151,N/A,NOT CERTIFIED,16.6282,7.6212,0.7698,1.0778,3.0023,49.9615,20.9392
-#@ SHA256: Ld8YpU5ALiur1ghP+3F7rt5SJWVbiarc9jV40gOjJlA=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:58
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+186-0,MeasuredSpeedVairBack,MeasuredSpeedVairBack.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8487,46.6939,15.8669,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,4881.4833,104.5421,0.0000,0.0000,4881.4833,104.5421,4881.4833,104.5421,12.5050,,,,191.3581,181.6952,327.2169,,,,7.2456,13.7599,20.8691,22.2872,8.0420,0.5117,0.0000,1.9832,1.9832,0.0065,0.0000,0.0000,0.2508,0.0000,0.0000,1.8435,0.8319,0.0000,-0.8568,3.1115,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3157,-0.3385,22.9407,21.4011,41.2625,80.5095,1.1306,1.6261,1113.9153,1620.3683,22.0000,14.3957,2.3095,0.0000,40.0308,0.3086,N/A,0.384926976360942,,,,,NOT CERTIFIED,N/A,0.970291794117452,,,,,,NOT CERTIFIED,N/A,0.803929612801758,N/A,NOT CERTIFIED,16.6282,7.6212,0.7698,1.0778,3.0023,49.9615,20.9392
+#@ SHA256: klqxbY8UXV2edGtkx6UoN4YS2pLSYbkmkFn6BWVGfGo=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
index 470a05e8a770da0aaf829c443219be455ca320c2..08f8b641a8fd1125bbcea73fb77559b5bffe6118 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairFront.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-175-0,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8459,46.6860,15.8669,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,0.0000,0.0000,5476.1124,117.2966,5476.1124,117.2966,14.0307,,,,183.2375,367.1384,,,,16.2812,25.4133,9.1700,0.3995,0.0000,1.9832,1.9832,0.0074,0.0000,0.0000,0.2593,0.0000,0.0000,1.8447,0.6764,0.0000,0.5289,3.1110,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3162,-0.3290,23.0177,22.4788,40.1078,80.5095,1.1306,1.6261,1114.7942,1620.7745,22.0000,14.3957,2.6944,0.0000,40.0308,0.3080,N/A,0.391258520914953,,,,,NOT CERTIFIED,N/A,0.971397292125,,,,,,NOT CERTIFIED,N/A,0.817191452320736,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0793,50.0385,20.7852
-#@ SHA256: tJu+u0yLWK78rEFad5uppu5TRMo+F94jSj/GaBqRNoE=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:58
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+187-0,MeasuredSpeedVairFront,MeasuredSpeedVairFront.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8459,46.6860,15.8669,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,5476.1124,117.2966,0.0000,0.0000,5476.1124,117.2966,5476.1124,117.2966,14.0307,,,,195.3606,183.2375,367.1384,,,,11.0840,16.2812,24.3063,25.4133,9.1700,0.3995,0.0000,1.9832,1.9832,0.0074,0.0000,0.0000,0.2593,0.0000,0.0000,1.8447,0.6764,0.0000,0.5289,3.1110,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3162,-0.3290,23.0177,22.4788,40.1078,80.5095,1.1306,1.6261,1114.7942,1620.7745,22.0000,14.3957,2.6944,0.0000,40.0308,0.3080,N/A,0.391258520914826,,,,,NOT CERTIFIED,N/A,0.971397292137282,,,,,,NOT CERTIFIED,N/A,0.817191452320676,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0793,50.0385,20.7852
+#@ SHA256: 4uzL6helpRHaRTvEDN/UvYpTkCwt10R9idq2I3VtmRM=
diff --git a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
index 180bcd15c00f174426c42981c30fdc819d86011c..d340601660c8e5fafab61691f728c741869e4970 100644
--- a/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
+++ b/VectoCore/VectoCoreTest/TestData/MeasuredSpeed/Results/MeasuredSpeedVairNoWind.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-172-0,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8465,46.6878,15.8669,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,0.0000,0.0000,5246.2770,112.3693,5246.2770,112.3693,13.4413,,,,182.5394,351.7160,,,,15.2940,24.1937,8.7299,0.4372,0.0000,1.9832,1.9832,0.0071,0.0000,0.0000,0.2561,0.0000,0.0000,1.8442,0.7314,0.0000,0.0000,3.1111,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3165,-0.3342,22.9407,21.8630,40.8006,80.5095,1.1306,1.6261,1113.8399,1620.3683,22.0000,14.3957,2.5404,0.0000,40.0308,0.3136,N/A,0.388800058742654,,,,,NOT CERTIFIED,N/A,0.970983969736596,,,,,,NOT CERTIFIED,N/A,0.812654301456777,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0023,49.9615,20.9392
-#@ SHA256: /2XyeyZgTRZ2Tw3QoDLUYjg2WVqQ5tACbOFdbN23YWc=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:58
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+184-0,MeasuredSpeedVairNoWind,MeasuredSpeedVairNoWind.vdri,Success,N/A,,N/A,-,8862.0000,0.0000,,8862.0000,N/A,Demo Engine,Diesel CI,185.0000,600.0000,2200.0000,6000.0000,1,1,1,0,1,1,Diesel CI,N/A,,6.1650,no,0.007144311,20800.0000,0.008081271,20800.0000,,,,,0.00764995394918169,0.00764995394918169,0.5200,1,1,0,N/A,Demo,MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,Demo,4.3000,,,,,,MT Shift Strategy,0,,,,1299.0000,16.8465,46.6878,15.8669,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,5246.2770,112.3693,0.0000,0.0000,5246.2770,112.3693,5246.2770,112.3693,13.4413,,,,193.7263,182.5394,351.7160,,,,9.6187,15.2940,22.9820,24.1937,8.7299,0.4372,0.0000,1.9832,1.9832,0.0071,0.0000,0.0000,0.2561,0.0000,0.0000,1.8442,0.7314,0.0000,0.0000,3.1111,0.3597,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.3165,-0.3342,22.9407,21.8630,40.8006,80.5095,1.1306,1.6261,1113.8399,1620.3683,22.0000,14.3957,2.5404,0.0000,40.0308,0.3136,N/A,0.388800058742699,,,,,NOT CERTIFIED,N/A,0.970983969739437,,,,,,NOT CERTIFIED,N/A,0.81265430145678,N/A,NOT CERTIFIED,16.5512,7.6982,0.7698,1.0778,3.0023,49.9615,20.9392
+#@ SHA256: ZL2w1CuZ3waoeW0qJiIMBfL8VWTBuWgnL+HE2h1VRQs=
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
index 5ed407c5151caa8767f8a579c7333735916d46de..20c324a9a5458acf84a0d969b4b9b1b8a18c2efb 100644
--- a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-177-0,Pwheel,Gear2_pt1_rep1_actual.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,Diesel CI,N/A,,4.1500,no,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,1.5000,0.0000,0.0000,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,0.0000,,12705.4509,,12705.4509,,,,,,0.0000,0.0000,,,,59.3466,62.3778,0.0260,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0007,0.0000,0.0000,0.0006,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1165.5495,1748.3243,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000,N/A,0.413918350764994,,,,,NOT CERTIFIED,N/A,0.974256651252911,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.0000,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000
-#@ SHA256: tnZKsE9ZsGZL84+b9oqitlaR+h4ICCUBogh9/f/p9gc=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:58
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+189-0,Pwheel,Gear2_pt1_rep1_actual.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,Diesel CI,N/A,,4.1500,no,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,1.5000,0.0000,0.0000,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,12705.4509,,0.0000,,12705.4509,,12705.4509,,,,,,0.0000,0.0000,0.0000,,,,59.3466,59.3466,62.3778,62.3778,0.0260,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0007,0.0000,0.0000,0.0006,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1165.5495,1748.3243,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000,N/A,0.413918350764994,,,,,NOT CERTIFIED,N/A,0.974256651252911,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.0000,0.0000,66.6667,0.0000,0.0000,0.0000,0.0000
+#@ SHA256: 6DXn7Y0IdTrcZPEVzAMT4aOxSzh9pNCVl7uV/N5wigA=
diff --git a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
index f193078a29d93e9ecff85ed05ffad6060972ed8e..cbfa145af6e0063005f2691b3b1ac5f1d0cb7af4 100644
--- a/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Pwheel/Results/Pwheel_ultimate.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:39
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
-178-0,Pwheel_ultimate,RD__1_Pwheel_AuxStd.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,Diesel CI,N/A,,4.1500,no,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,1566.4000,0.0000,0.0000,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,0.0000,,10013.8397,,10013.8397,,,,,,184.6608,0.0000,,,,41.2262,47.3192,20.5891,0.9829,-0.0004,1.5039,1.5039,0.0169,0.0000,0.0000,0.7227,0.0000,0.0000,1.0764,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1401.0184,2421.2271,52.0000,100.0000,7.1757,0.0000,0.0000,0.0000,N/A,0.398392847549503,,,,,NOT CERTIFIED,N/A,0.968896043991578,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.2809,0.7150,8.7334,3.4729,10.2145,12.1297,64.4535
-#@ SHA256: OVqat7dPuYnkDVHIowcJTYFjg7rrKLIFIvvMA6ognzs=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:58
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%]
+190-0,Pwheel_ultimate,RD__1_Pwheel_AuxStd.vdri,Success,N/A,,N/A,-,12000.0000,0.0000,,12000.0000,N/A,OM906 175 kW,Diesel CI,175.0000,600.0000,2200.0000,6374.0000,1,1,1,0,1,1,Diesel CI,N/A,,4.1500,no,0.0061,20846.0000,0.0061,19679.0000,,,,,0.0061139563906202,0.0061139563906202,0.4210,1,1,0,N/A,"G 85-6/6,7-0,73",MT,6.6960,0.7280,N/A,N/A,N/A,N/A,None,N/A,N/A,N/A,N/A,"G 85-6/6,7-0,73",4.3000,,,,,,,0,,,,1566.4000,0.0000,0.0000,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,10013.8397,,0.0000,,10013.8397,,10013.8397,,,,,,173.2629,184.6608,0.0000,,,,34.0136,41.2262,45.0604,47.3192,20.5891,0.9829,-0.0004,1.5039,1.5039,0.0169,0.0000,0.0000,0.7227,0.0000,0.0000,1.0764,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1401.0184,2421.2271,52.0000,100.0000,7.1757,0.0000,0.0000,0.0000,N/A,0.398392847549503,,,,,NOT CERTIFIED,N/A,0.968896043991578,,,,,,NOT CERTIFIED,N/A,0,N/A,NOT CERTIFIED,0.2809,0.7150,8.7334,3.4729,10.2145,12.1297,64.4535
+#@ SHA256: ox4OVTlbkfOBIs8WV+p49/9JEym3Zb7gtUdcYYKFMmo=
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum
index 5f9c9396c35b4cb7a6b24d0d3f33da2814ec8b96..a170c1cf40de4c8514618a6742325a7108014eff 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/24t Coach EngineOnly.vsum
@@ -1,6 +1,6 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 17:06
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_cycle [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option
-206-0,24t Coach EngineOnly,Engine Only1.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,695.0000,0.0000,0.0000,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,0.0000,,8165.4651,,8165.4651,,,,,,171.8999,0.0000,,,,0.0000,30.0366,5.7987,0.3501,0.0194,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1306.6190,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,,0.310130398319601,,,,,,,,,,,,,,,,,
-206-1,24t Coach EngineOnly,Engine Only2.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1006.0000,0.0000,0.0000,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,0.0000,,8480.9585,,8480.9585,,,,,,165.6956,0.0000,,,,0.0000,30.8542,8.6220,0.5488,0.0161,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1368.7890,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,,0.306721156907804,,,,,,,,,,,,,,,,,
-206-2,24t Coach EngineOnly,Engine Only3.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,166.0000,0.0000,0.0000,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,0.0000,,6591.7966,,6591.7966,,,,,,174.5276,0.0000,,,,0.0000,21.9781,1.0134,0.1282,0.0060,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1213.8903,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,,0.281100452512794,,,,,,,,,,,,,,,,,
-#@ SHA256: PmuTIZTuDwAoneynObg30xxSiAv0etXltMN0I4Sz8xA=
+# VECTO-DEV 0.6.1.1957-DEV - 27.05.2020 11:39
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_cycle [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option
+1-0,24t Coach EngineOnly,Engine Only1.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,695.0000,0.0000,0.0000,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,8165.4651,,0.0000,,8165.4651,,8165.4651,,,,,,,171.8999,0.0000,,,,0.0000,0.0000,28.2231,30.0366,5.7987,0.3501,0.0194,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1306.6190,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,,0.310130398319601,,,,,,,,,,,,,,,,,
+1-1,24t Coach EngineOnly,Engine Only2.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1006.0000,0.0000,0.0000,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,8480.9585,,0.0000,,8480.9585,,8480.9585,,,,,,,165.6956,0.0000,,,,0.0000,0.0000,28.8901,30.8542,8.6220,0.5488,0.0161,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1368.7890,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,,0.306721156907804,,,,,,,,,,,,,,,,,
+1-2,24t Coach EngineOnly,Engine Only3.vdri,Success,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,166.0000,0.0000,0.0000,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,6591.7966,,0.0000,,6591.7966,,6591.7966,,,,,,,174.5276,0.0000,,,,0.0000,0.0000,19.1988,21.9781,1.0134,0.1282,0.0060,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,1213.8903,2453.5890,,100.0000,0.0000,0.0000,0.0000,0.0000,,0.281100452512794,,,,,,,,,,,,,,,,,
+#@ SHA256: Xr4cFAQZRhH3QG5bqo+tLhk1uaZMjIGwsRz6/oAADs4=
diff --git a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
index 3a827509072794ac8c2482ba53af13dd45e8a68d..4f3391491bbe49d16ec5bde03c5a41a8cc8cf2a8 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Results/EngineOnlyCycles/AuxWriteModFileSumFile.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 16:37
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_FAN [kWh],E_aux_PS [kWh],E_aux_STP [kWh],E_aux_ES [kWh],E_aux_AC [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option
-0-0,MockJob,MockCycle.vdri,Pending,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,,,,,0.0000,0.0000,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0037,0.0049,0.0017,0.0052,0.0011,0.0165,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,100.0000,100.0000,0.0000,0.0000,0.0000,,0,,,,,,,0,,,,,,,,0,,
-#@ SHA256: frNBN7m4xlwD/9gG55TLkI9sgm+6XZPOj46b2xN6vkc=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:56
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_FAN [kWh],E_aux_PS [kWh],E_aux_STP [kWh],E_aux_ES [kWh],E_aux_AC [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option
+0-0,MockJob,MockCycle.vdri,Pending,,,,,,,,,,,,,,,,,,,,,,Diesel CI,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,11.0000,0.0000,0.0000,0.0000,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,0.0000,,,,,,0.0000,0.0000,0.0000,,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0037,0.0049,0.0017,0.0052,0.0011,0.0165,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,,100.0000,100.0000,0.0000,0.0000,0.0000,,0,,,,,,,0,,,,,,,,0,,
+#@ SHA256: WQoQ9IfGSJKCU0IH7qCvRqO5u6uE/dzNw5UAP2zUbFg=
diff --git a/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum b/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum
index 520904cebb4b52507428c64ddb141388e2361f41..28895370ce8a1f39f07c7b66f9fe86c4753dc527 100644
--- a/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum
+++ b/VectoCore/VectoCoreTest/TestData/Results/Integration/job.vsum
@@ -1,4 +1,4 @@
-# VECTO-DEV 0.6.0.1884-DEV - 03.04.2020 15:40
-Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in_pos [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%],Gear 7 TimeShare [%],Gear 8 TimeShare [%]
-101-0,job,1-Gear-Test-dist.vdri,Success,N/A,,N/A,-,15700.0000,3300.0000,,19000.0000,N/A,Generic 24t Coach,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2634,no,0.0055,62538.7500,0.0065,52532.5500,0.0055,62538.7500,,,0.00640424928879442,0.00640424928879442,0.5200,1,2,0,N/A,Generic 24t Coach,AMT,6.3800,0.7600,N/A,N/A,N/A,N/A,Secondary Retarder,N/A,N/A,3.5,N/A,Generic 24t Coach,3.2404,,,,,,AMT - EffShift,0,,,,4117.8419,16.8120,14.6978,-43.9640,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,0.0000,0.0000,3746.5757,254.9073,3746.5757,254.9073,30.4913,9.2398,,,161.9798,797.8599,241.7757,,,9.0919,14.2793,16.3333,2.2314,0.0027,0.0000,0.0000,0.0082,0.0000,0.0000,1.0012,1.2154,4.8398,1.4520,1.9638,0.0835,0.2358,5.5710,-2.2714,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0013,0.6173,-0.2686,0.4209,0.3165,99.2140,20.0000,1.3773,0.6427,718.5639,1562.0320,6.0000,0.0486,0.0562,0.0000,0.0321,0.1138,N/A,0.321326539165827,,,,,NOT CERTIFIED,N/A,0.951733558640747,NOT CERTIFIED,N/A,NOT CERTIFIED,N/A,0.776404775129507,NOT CERTIFIED,N/A,0.916823163640295,N/A,NOT CERTIFIED,0.8579,0.0000,0.0000,0.0000,0.0000,0.0572,0.1522,49.8928,49.0399
-#@ SHA256: ItH0BK9lvAEamej+5gNJBgOrgTAPuBlvItN7pDueUUE=
+# VECTO-DEV 0.6.1.1957-DEV - 26.05.2020 21:00
+Job [-],Input File [-],Cycle [-],Status,Vehicle manufacturer [-],VIN number,Vehicle model [-],HDV CO2 vehicle class [-],Corrected Actual Curb Mass [kg],Loading [kg],Passenger count [-],Total vehicle mass [kg],Engine manufacturer [-],Engine model [-],Engine fuel type [-],Engine rated power [kW],Engine idling speed [rpm],Engine rated speed [rpm],Engine displacement [ccm],Engine WHTCUrban,Engine WHTCRural,Engine WHTCMotorway,Engine BFColdHot,Engine CFRegPer,Engine actual CF,Vehicle fuel type [-],AirDrag model [-],Declared CdxA [m²],CdxA [m²],Sleeper cab [-],Declared RRC axle 1 [-],Declared FzISO axle 1 [N],Declared RRC axle 2 [-],Declared FzISO axle 2 [N],Declared RRC axle 3 [-],Declared FzISO axle 3 [N],Declared RRC axle 4 [-],Declared FzISO axle 4 [N],total RRC [-],weighted RRC w/o trailer [-],r_dyn [m],Number axles vehicle driven [-],Number axles vehicle non-driven [-],Number axles trailer [-],Gearbox manufacturer [-],Gearbox model [-],Gearbox type [-],Gear ratio first gear [-],Gear ratio last gear [-],Torque converter manufacturer [-],Torque converter model [-],Retarder manufacturer [-],Retarder model [-],Retarder type [-],Angledrive manufacturer [-],Angledrive model [-],Angledrive ratio [-],Axle manufacturer [-],Axle model [-],Axle gear ratio [-],Auxiliary technology STP [-],Auxiliary technology FAN [-],Auxiliary technology AC [-],Auxiliary technology PS [-],Auxiliary technology ES [-],ShiftStrategy,ADAS technology combination [-],PTOShaftsGearWheels,Auxiliary technology cycle [-],Cargo Volume [m³],time [s],distance [km],speed [km/h],altitudeDelta [m],FC-Map [g/h],FC-Map [g/km],FC-NCVc [g/h],FC-NCVc [g/km],FC-WHTCc [g/h],FC-WHTCc [g/km],FC-ESS [g/h],FC-ESS [g/km],FC-ESS_Corr [g/h],FC-ESS_Corr [g/km],FC-BusAux_PS_Corr [g/h],FC-BusAux_PS_Corr [g/km],FC-BusAux_ES_Corr [g/h],FC-BusAux_ES_Corr [g/km],FC-WHR_Corr [g/h],FC-WHR_Corr [g/km],FC-BusAux_AuxHeater [g/h],FC-BusAux_AuxHeater [g/km],FC-BusAux_AuxHeater_Corr [g/h],FC-BusAux_AuxHeater_Corr [g/km],FC-Final [g/h],FC-Final [g/km],FC-Final [l/100km],FC-Final [l/100tkm],FC-Final [l/100m³km],FC-Final [l/100Pkm],k_vehline [g/kWh],k_engline [g/kWh],CO2 [g/km],CO2 [g/tkm],CO2 [g/m³km],CO2 [g/Pkm],P_wheel_in [kW],P_wheel_in_pos [kW],P_fcmap [kW],P_fcmap_pos [kW],E_fcmap_pos [kWh],E_fcmap_neg [kWh],E_powertrain_inertia [kWh],E_aux_CYCLE [kWh],E_aux_sum [kWh],E_clutch_loss [kWh],E_tc_loss [kWh],E_shift_loss [kWh],E_gbx_loss [kWh],E_ret_loss [kWh],E_angle_loss [kWh],E_axl_loss [kWh],E_brake [kWh],E_vehi_inertia [kWh],E_air [kWh],E_roll [kWh],E_grad [kWh],BusAux PS air consumed [Nl],BusAux PS air generated [Nl],E_PS_compressorOff [kWh],E_PS_compressorOn [kWh],E_BusAux_ES_consumed [kWh],E_BusAux_ES_generated [kWh],ΔE_BusAux_Bat [kWh],E_BusAux_PS_corr [kWh],E_BusAux_ES_mech_corr [kWh],E_BusAux_HVAC_mech [kWh],E_BusAux_HVAC_el [kWh],E_BusAux_AuxhHeater [kWh],E_WHR_el [kWh],E_WHR_mech [kWh],E_aux_ess_mech [kWh],E_ice_start [kWh],ice_starts [-],a [m/s^2],a_pos [m/s^2],a_neg [m/s^2],AccelerationTimeShare [%],DecelerationTimeShare [%],CruiseTimeShare [%],max. speed [km/h],max. acc [m/s²],max. dec [m/s²],n_eng_avg [rpm],n_eng_max [rpm],gear shifts [-],StopTimeShare [%],Engine max. Load time share [%],CoastingTimeShare [%],BrakingTImeShare [%],a_avg_acc,Engine certification number,Average engine efficiency [%],Torque converter certification option,TorqueConverter certification number,Average torque converter efficiency w/o lockup [%],Average torque converter efficiency with lockup [%],Gearbox certification option,Gearbox certification number,Average gearbox efficiency [%],Retarder certification option,Retarder certification number,Angledrive certification option,Angledrive certification number,Average angledrive efficiency [%],Axlegear certification method,Axlegear certification number,Average axlegear efficiency [%],AirDrag certification number,AirDrag certification option,Gear 0 TimeShare [%],Gear 1 TimeShare [%],Gear 2 TimeShare [%],Gear 3 TimeShare [%],Gear 4 TimeShare [%],Gear 5 TimeShare [%],Gear 6 TimeShare [%],Gear 7 TimeShare [%],Gear 8 TimeShare [%]
+110-0,job,1-Gear-Test-dist.vdri,Success,N/A,,N/A,-,15700.0000,3300.0000,,19000.0000,N/A,Generic 24t Coach,Diesel CI,350.5052,560.0000,1736.4865,12730.0000,1,1,1,0,1,1,Diesel CI,N/A,,3.2634,no,0.0055,62538.7500,0.0065,52532.5500,0.0055,62538.7500,,,0.00640424928879442,0.00640424928879442,0.5200,1,2,0,N/A,Generic 24t Coach,AMT,6.3800,0.7600,N/A,N/A,N/A,N/A,Secondary Retarder,N/A,N/A,3.5,N/A,Generic 24t Coach,3.2404,,,,,,AMT - EffShift,0,,,,4117.8419,16.8120,14.6978,-43.9640,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,3746.5757,254.9073,0.0000,0.0000,3746.5757,254.9073,3746.5757,254.9073,30.4913,9.2398,,,156.4676,162.0079,797.8599,241.7757,,,3.1638,9.0919,12.3285,14.2793,16.3333,2.2314,0.0027,0.0000,0.0000,0.0082,0.0000,0.0000,1.0012,1.2154,4.8398,1.4520,1.9638,0.0835,0.2358,5.5710,-2.2714,,,,,,,,0.0000,0.0000,,,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0013,0.6173,-0.2686,0.4209,0.3165,99.2140,20.0000,1.3773,0.6427,718.5639,1562.0320,6.0000,0.0486,0.0562,0.0000,0.0321,0.1138,N/A,0.321326539166505,,,,,NOT CERTIFIED,N/A,0.951733558646147,NOT CERTIFIED,N/A,NOT CERTIFIED,N/A,0.776404775130783,NOT CERTIFIED,N/A,0.916823163639695,N/A,NOT CERTIFIED,0.8579,0.0000,0.0000,0.0000,0.0000,0.0572,0.1522,49.8928,49.0399
+#@ SHA256: tT4Zu48RvJEPku+mmqhLAQz+nfx00gfrjZMxZtr8BPQ=
diff --git a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
index 71c8dc833041dc3712b83c1414fc07ffeb2a3923..7e675380efad35ffc5f4b2e36fc321387814cb30 100644
--- a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
@@ -49,7 +49,7 @@ namespace TUGraz.VectoCore.Tests.Utils {
public int NumberOfPassengersUpperDeck { get; set; }
public int NumberOfPassengersLowerDeck { get; set; }
public VehicleCode VehicleCode { get; set; }
- public FloorType FloorType { get; }
+ public bool LowEntry { get; }
public bool Articulated { get; }
public Meter Height { get; set; }
public Meter Length { get; set; }
@@ -113,7 +113,7 @@ namespace TUGraz.VectoCore.Tests.Utils {
public int NumberOfPassengersUpperDeck { get; set; }
public int NumberOfPassengersLowerDeck { get; set; }
public VehicleCode VehicleCode { get; set; }
- public FloorType FloorType { get; }
+ public bool LowEntry { get; }
IVehicleComponentsDeclaration IVehicleDeclarationInputData.Components
{
diff --git a/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs b/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
index 30907527c2083b3b87410f18c02e7d3b2cf41fd7..54812ad631a74bfab2b2e3f10f47a584bbc0ffec 100644
--- a/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
@@ -236,7 +236,7 @@ namespace TUGraz.VectoCore.Tests.Utils
public Func<Second, Joule, Joule> AuxHeaterDemandCalc { get; set; }
- public KilogramPerWattSecond VehicleLineCorrectionFactor(IFuelProperties fuel)
+ public KilogramPerWattSecond EngineLineCorrectionFactor(IFuelProperties fuel)
{
return 0.SI<KilogramPerWattSecond>();
}
@@ -246,6 +246,11 @@ namespace TUGraz.VectoCore.Tests.Utils
}
+ public KilogramPerWattSecond VehicleLineSlope(IFuelProperties fuel)
+ {
+ return 0.SI<KilogramPerWattSecond>();
+ }
+
public string RunName { get; set; }
public string CycleName { get; set; }
public string RunSuffix { get; set; }
diff --git a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
index 19e039fcf78e2859cee96c6891fbd745586d3efc..222e9985a34d742f3252b7375ae166e5f4e94927 100644
--- a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
@@ -59,7 +59,7 @@ namespace TUGraz.VectoCore.Tests.XML
Assert.IsNull(vehicle.TankSystem);
Assert.AreEqual(50, vehicle.NumberOfPassengersLowerDeck);
Assert.AreEqual(0, vehicle.NumberOfPassengersUpperDeck);
- Assert.AreEqual(FloorType.LowFloor, vehicle.FloorType);
+ Assert.IsTrue(vehicle.LowEntry);
Assert.AreEqual(2.700, vehicle.Height.Value());
Assert.AreEqual(11.830, vehicle.Length.Value());
Assert.AreEqual(2.550, vehicle.Width.Value());
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml
index 1b50024a9241f088c9deba463f4d1936e2a9357d..ac9f3cfbe8a7f6c38f5c17939fc9aad27d5c191c 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_PIF.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<pif:VectoOutputPrimaryVehicle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation:HeavyBus:v0.1" xmlns:pif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:PrimaryVehicleInformation https://webgate.ec.europa.eu/CITnet/svn/VECTO/trunk/Share/XML/XSD//DEV/VectoOutputPrimaryVehicleInformation.xsd">
- <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-3c3a0ed335444192bea8">
+ <pif:Data xsi:type="PrimaryVehicleHeavyBusDataType" id="PIF-b66632d98e664d6dbd52">
<Vehicle xsi:type="VehiclePIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
@@ -10,7 +10,7 @@
<VehicleCategory>Bus</VehicleCategory>
<AxleConfiguration>4x2</AxleConfiguration>
<Articulated>false</Articulated>
- <TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
+ <TechnicalPermissibleMaximumLadenMass>40000</TechnicalPermissibleMaximumLadenMass>
<IdlingSpeed>700</IdlingSpeed>
<RetarderType>Transmission Output Retarder</RetarderType>
<RetarderRatio>1.000</RetarderRatio>
@@ -214,13 +214,13 @@
</di:Reference>
</InputDataSignature>
<ManufacturerRecordSignature>
- <di:Reference URI="#RESULT-2f5cc7aab2544f56ae73">
+ <di:Reference URI="#RESULT-1bb8e1c4d2a0410db8a3">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>bOrQ6bQixJt5hoaDBGcf49dOqY2XRBZ0mhKqXzuO+Ok=</di:DigestValue>
+ <di:DigestValue>q8w0EqfrChDsGxMmi8D9CZEYMauwImko53TfPFwdaTc=</di:DigestValue>
</di:Reference>
</ManufacturerRecordSignature>
<Results>
@@ -235,9 +235,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.12292</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.73851</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1621.7</CO2>
+ <CO2 unit="g/km">1520.18</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -249,9 +249,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">26.33759</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">24.94611</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1930.6</CO2>
+ <CO2 unit="g/km">1828.60</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -263,9 +263,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">17.87775</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">16.93598</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1310.5</CO2>
+ <CO2 unit="g/km">1241.44</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -277,9 +277,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">21.34392</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">20.36950</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1564.6</CO2>
+ <CO2 unit="g/km">1493.13</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -291,9 +291,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.88888</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.03487</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1164.7</CO2>
+ <CO2 unit="g/km">1102.09</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31SD</VehicleGroup>
@@ -305,9 +305,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.06094</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">18.14589</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1397.2</CO2>
+ <CO2 unit="g/km">1330.13</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -319,9 +319,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">22.57521</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">21.81903</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1654.8</CO2>
+ <CO2 unit="g/km">1599.38</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -333,9 +333,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">26.99415</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">26.59833</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1978.7</CO2>
+ <CO2 unit="g/km">1949.71</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -347,9 +347,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">18.32938</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">17.82311</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1343.6</CO2>
+ <CO2 unit="g/km">1306.47</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -361,9 +361,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">21.95764</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">21.69768</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1609.5</CO2>
+ <CO2 unit="g/km">1590.49</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -375,9 +375,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.41503</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.74932</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1203.3</CO2>
+ <CO2 unit="g/km">1154.46</CO2>
</Result>
<Result status="success">
<VehicleGroup>P31DD</VehicleGroup>
@@ -389,37 +389,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">19.70852</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">19.17775</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1444.7</CO2>
+ <CO2 unit="g/km">1405.77</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
- <Payload unit="kg">1075.44</Payload>
- <PassengerCount>15.15</PassengerCount>
+ <TotalVehicleMass unit="kg">14029.90</TotalVehicleMass>
+ <Payload unit="kg">879.90</Payload>
+ <PassengerCount>12.39</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.95443</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.07930</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1022.9</CO2>
+ <CO2 unit="g/km">958.74</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">17451.75</TotalVehicleMass>
- <Payload unit="kg">4301.75</Payload>
- <PassengerCount>60.59</PassengerCount>
+ <TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
+ <Payload unit="kg">3519.61</Payload>
+ <PassengerCount>49.57</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">15.69902</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">14.54412</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1150.8</CO2>
+ <CO2 unit="g/km">1066.11</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
@@ -431,9 +431,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.00564</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.13867</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">880.0</CO2>
+ <CO2 unit="g/km">816.49</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32SD</VehicleGroup>
@@ -445,37 +445,37 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.43599</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.58643</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">911.6</CO2>
+ <CO2 unit="g/km">849.31</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
- <Payload unit="kg">1262.82</Payload>
- <PassengerCount>17.79</PassengerCount>
+ <TotalVehicleMass unit="kg">14452.35</TotalVehicleMass>
+ <Payload unit="kg">1052.35</Payload>
+ <PassengerCount>14.82</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">14.32957</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">13.50960</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1050.4</CO2>
+ <CO2 unit="g/km">990.28</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
<Mission>Interurban</Mission>
<SimulationParameters>
- <TotalVehicleMass unit="kg">18451.30</TotalVehicleMass>
- <Payload unit="kg">5051.30</Payload>
- <PassengerCount>71.15</PassengerCount>
+ <TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
+ <Payload unit="kg">4209.41</Payload>
+ <PassengerCount>59.29</PassengerCount>
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">16.30992</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">15.22020</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1195.6</CO2>
+ <CO2 unit="g/km">1115.67</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
@@ -487,9 +487,9 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">12.52741</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">11.61807</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">918.3</CO2>
+ <CO2 unit="g/km">851.63</CO2>
</Result>
<Result status="success">
<VehicleGroup>P32DD</VehicleGroup>
@@ -501,24 +501,24 @@
<FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="Diesel CI">
- <EnergyConsumption unit="MJ/km">13.01279</EnergyConsumption>
+ <EnergyConsumption unit="MJ/km">12.15012</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">953.9</CO2>
+ <CO2 unit="g/km">890.63</CO2>
</Result>
</Results>
<ApplicationInformation>
- <SimulationToolVersion>0.6.1.1932-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
- <Date>2020-04-27T15:04:22.0809726Z</Date>
+ <SimulationToolVersion>0.6.1.1957-DEV !!NOT FOR CERTIFICATION!!</SimulationToolVersion>
+ <Date>2020-05-27T08:30:56.6379619Z</Date>
</ApplicationInformation>
</pif:Data>
<pif:Signature>
- <di:Reference URI="#PIF-3c3a0ed335444192bea8">
+ <di:Reference URI="#PIF-b66632d98e664d6dbd52">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization" />
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
</di:Transforms>
<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
- <di:DigestValue>4feqZKffRbmushwCdq9Rz1vO+NRc5prQhCGvhbjovVM=</di:DigestValue>
+ <di:DigestValue>HjEp4pTd8F+QDECiVrVjac82ZOZfroNGuuFa402/g5o=</di:DigestValue>
</di:Reference>
</pif:Signature>
</pif:VectoOutputPrimaryVehicle>
\ No newline at end of file