Merge pull request #846 in VECTO/vecto-sim from...

Merge pull request #846 in VECTO/vecto-sim from VECTO/mq_vecto-sim:bugfix/VECTO-1392-fuel-consumption-vtp-report to develop

* commit '7b5ed800':
  set correct engine correction factor for VTP simulation,write CO2 values in VTP report (fix)

VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs

@@ -170,6 +170,13 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
 			}
 			var loading = mission.Loadings.FirstOrDefault(l => l.Key == DeclarationData.VTPMode.SelectedLoading);
 			var runData = CreateVectoRunData(Segment, mission, loading.Value);
+			runData.EngineData.FuelConsumptionCorrectionFactor = DeclarationData.WHTCCorrection.Lookup(
+																	mission.MissionType.GetNonEMSMissionType(), runData.EngineData.WHTCRural, runData.EngineData.WHTCUrban,
+																	runData.EngineData.WHTCMotorway) *
+																runData.EngineData.ColdHotCorrectionFactor * runData.EngineData.CorrectionFactorRegPer;
+			var adasCombination = DeclarationData.ADASCombinations.Lookup(JobInputData.Vehicle.ADAS);
+			runData.EngineData.ADASCorrectionFactor = DeclarationData.ADASBenefits.Lookup(
+				Segment.VehicleClass, adasCombination, mission.MissionType, loading.Key);
 			runData.ModFileSuffix = loading.Key.ToString();
 			var cycle = DrivingCycleDataReader.ReadFromStream(mission.CycleFile, CycleType.DistanceBased, "", false);
 			runData.Cycle = new DrivingCycleProxy(cycle, mission.MissionType.ToString());

VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs

@@ -189,7 +189,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 			var vtpFcMeasuredCorr = vtpResult.VTPFcMeasured / vtpResult.VTPWorkPWheelPos * vtpResult.VTPFcCorrectionFactor;
 			var vtpFcSimulated = vtpResult.VTPFcFinalSimulated / vtpResult.FuelData.HeatingValueCorrection / vtpResult.VTPWorPWheelSimPos;
 			var cVtp = vtpFcMeasuredCorr / vtpFcSimulated;
-			var declaredCO2 = result.FuelConsumptionTotal / result.Distance / result.Payload;
+			var declaredCO2 = result.FuelConsumptionTotal * result.FuelData.CO2PerFuelWeight / result.Distance / result.Payload;
 			var verifiedCO2 = declaredCO2 * cVtp;
 
 			Results.Add(