From 3e8c2685f90e6c980d219cfc1c0eee8df85b24a0 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Fri, 23 Dec 2022 11:11:54 +0100
Subject: [PATCH] do not write fuel consumption if the fuelconsumptionwriter is
null
---
.../Common/ResultTotalWriter.cs | 23 +++++++++++--------
.../ResultWriter/SummaryWriter.cs | 8 +++++--
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/ResultTotalWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/ResultTotalWriter.cs
index aff066ceb4..fb1e35a525 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/ResultTotalWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/Common/ResultTotalWriter.cs
@@ -15,16 +15,19 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.Common
#region Overrides of AbstractResultWriter
public override XElement GetElement(IResultEntry entry)
- {
- return new XElement(TNS + XMLNames.Report_ResultEntry_Total,
- VehiclePerformanceWriter.GetElement(entry),
- entry.FuelData.Select(f =>
- FuelConsumptionWriter?.GetElement(entry, entry.FuelConsumptionFinal(f.FuelType))),
- ElectricEnergyConsumptionWriter?.GetElement(entry),
- CO2Writer?.GetElements(entry),
- ElectricRangeWriter?.GetElements(entry)
- );
- }
+ {
+ var fcWrtier = FuelConsumptionWriter;
+ return new XElement(TNS + XMLNames.Report_ResultEntry_Total,
+ VehiclePerformanceWriter.GetElement(entry),
+ fcWrtier != null
+ ? entry.FuelData.Select(f =>
+ fcWrtier.GetElement(entry, entry.FuelConsumptionFinal(f.FuelType)))
+ : null,
+ ElectricEnergyConsumptionWriter?.GetElement(entry),
+ CO2Writer?.GetElements(entry),
+ ElectricRangeWriter?.GetElements(entry)
+ );
+ }
#endregion
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/ResultWriter/SummaryWriter.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/ResultWriter/SummaryWriter.cs
index e629f871b1..8157891313 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/ResultWriter/SummaryWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/CustomerInformationFile/CustomerInformationFile_0_9/ResultWriter/SummaryWriter.cs
@@ -32,11 +32,15 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.CustomerInformation
if (weighted == null) {
return null;
}
+
+ var fcWriter = FuelConsumptionWriter;
return new XElement(TNS + XMLNames.Report_Results_Summary,
new XAttribute(xsi + XMLNames.XSIType, ResultSummaryXMLType),
GetSummary(weighted),
- weighted.FuelConsumption.Select(x =>
- FuelConsumptionWriter?.GetElement(weighted, x.Key, x.Value)).ToArray(),
+ fcWriter != null
+ ? weighted.FuelConsumption.Select(x =>
+ fcWriter.GetElement(weighted, x.Key, x.Value)).ToArray()
+ : null,
ElectricEnergyConsumptionWriter?.GetElement(weighted),
CO2Writer?.GetElements(weighted),
ElectricRangeWriter?.GetElements(weighted)
--
GitLab