Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS will be completely phased out by mid-2025. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit 12224f0d authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

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
parents 4a9ca5ba 6551287c
No related branches found
No related tags found
No related merge requests found
......@@ -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()),
......
......@@ -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[] {
......
......@@ -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;
......
......@@ -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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment