diff --git a/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs index 5b1aa0be71fa203e15b723bda05d3c08acee8c4a..851676df897a0b1b4ca342c867f3caddd83a7a64 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 aecf88b7ef4ab2df78423bdef29c9e37f41e1681..8998b8d2cd82dedf56575cfcd38aa70ef564c524 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 9257578772e7ac8856e1b2dbb4be87b57563aba3..53aabd7f9b0ccaa4c63e60d67e0cbe4ef6e5c03f 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 b084c4d5aea31bccfcab2a679d1702046898287b..5d6b8cdf70de0f573c4fcbf3b4f39954772c49d9 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>