Pull request #898: bugfix writing CIF/MRF for exempted vehicles, updating monitoring XML

Merge in VECTO/vecto-sim from VECTO/mq_vecto-sim:VECTO-1619-adaptations-of-xml-results-in-transition-period to develop

* commit '6551287c':
  bugfix writing CIF/MRF for exempted vehicles, updating monitoring XML

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()),

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[] {

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;
 

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>