From 6551287c8352f86bcbcbcfebe7231f6aa3675918 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Wed, 27 Jul 2022 14:10:08 +0200
Subject: [PATCH] bugfix writing CIF/MRF for exempted vehicles, updating
monitoring XML
---
VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs | 4 ++--
VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs | 2 +-
VectoCore/VectoCore/OutputData/XML/XMLMonitoringReport.cs | 2 +-
VectoCore/VectoCore/Resources/XSD/VectoMonitoring.xsd | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
index 5b1aa0be71..851676df89 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs
@@ -95,8 +95,8 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Vehicle_CurbMassChassis, XMLHelper.ValueAsUnit(modelData.VehicleData.CurbMass, XMLNames.Unit_kg)),
new XElement(tns + XMLNames.Vehicle_ZeroEmissionVehicle, modelData.VehicleData.ZeroEmissionVehicle),
new XElement(tns + XMLNames.Vehicle_HybridElectricHDV, modelData.VehicleData.HybridElectricHDV),
- new XElement(tns + "WasteHeatRecovery", modelData.EngineData.WHRType != WHRType.None),
- new XElement(tns + XMLNames.Vehicle_DualFuelVehicle, modelData.EngineData.Fuels.Count > 1),
+ new XElement(tns + "WasteHeatRecovery", exempted ? false : modelData.EngineData.WHRType != WHRType.None),
+ new XElement(tns + XMLNames.Vehicle_DualFuelVehicle, exempted ? modelData.VehicleData.DualFuelVehicle : modelData.EngineData.Fuels.Count > 1),
exempted ? ExemptedData(modelData) : new[] {
new XElement(tns + XMLNames.Vehicle_AxleConfiguration, modelData.VehicleData.AxleConfiguration.GetName()),
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
index aecf88b7ef..8998b8d2cd 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs
@@ -91,7 +91,7 @@ namespace TUGraz.VectoCore.OutputData.XML
new XElement(tns + XMLNames.Vehicle_CurbMassChassis, XMLHelper.ValueAsUnit(modelData.VehicleData.CurbMass, XMLNames.Unit_kg)),
new XElement(tns + XMLNames.Vehicle_ZeroEmissionVehicle, modelData.VehicleData.ZeroEmissionVehicle),
new XElement(tns + XMLNames.Vehicle_HybridElectricHDV, modelData.VehicleData.HybridElectricHDV),
- new XElement(tns + XMLNames.Vehicle_DualFuelVehicle, modelData.EngineData.Fuels.Count > 1),
+ new XElement(tns + XMLNames.Vehicle_DualFuelVehicle, exempted ? modelData.VehicleData.DualFuelVehicle : modelData.EngineData.Fuels.Count > 1),
exempted
? ExemptedData(modelData)
: new[] {
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLMonitoringReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLMonitoringReport.cs
index 9257578772..53aabd7f9b 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLMonitoringReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLMonitoringReport.cs
@@ -46,7 +46,7 @@ namespace TUGraz.VectoCore.OutputData.XML
{
public const string SCHEMA_VERSION_STRING = "0.7";
- public const string CURRENT_SCHEMA_VERSION = "0.7.1";
+ public const string CURRENT_SCHEMA_VERSION = "0.7.2";
private XMLManufacturerReport _manufacturerReport;
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.xsd b/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.xsd
index b084c4d5ae..5d6b8cdf70 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoMonitoring.xsd
@@ -8,4 +8,5 @@
-->
<xs:import namespace="urn:tugraz:ivt:VectoAPI:MonitoringOutput:v0.7" schemaLocation="VectoMonitoring.0.7.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:MonitoringOutput:v0.7.1" schemaLocation="VectoMonitoring.0.7.1.xsd"/>
+ <xs:import namespace="urn:tugraz:ivt:VectoAPI:MonitoringOutput:v0.7.2" schemaLocation="VectoMonitoring.0.7.2.xsd"/>
</xs:schema>
--
GitLab