diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs index d85f808baa5334028191ab1d4799d478169f3af0..82cf10c0feac4245aaee4e064817d8bc7239c5b2 100644 --- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationVTPModeVectoRunDataFactory.cs +++ b/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()); diff --git a/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs index 709aac33b19d87d9499f96d5bc3819c7e9c72b70..43bf9c9974787b33ce939ffb8fedc19b77b0a275 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLVTPReport.cs +++ b/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(