From f2bd4f8a8cfd028e5fba33542f45751dd0ccfcae Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 11 Jul 2022 15:25:58 +0200
Subject: [PATCH] extending VIF xml schema: consider results for OVC, PEV
correcting typo in schema correcting sample XML files
---
.../Resources/XSD/VectoOutputCustomer.0.9.xsd | 2 +-
.../XSD/VectoOutputManufacturer.0.9.xsd | 8 ++-
.../XSD/VectoOutputMultistep.0.1.xsd | 62 +++++++++++++------
.../MRF_MockupResults_Conv_Bus.xml | 1 +
.../MockupResults/MRF_MockupResults_Error.xml | 1 +
.../MRF_MockupResults_OVC-HEV_Bus.xml | 11 ++--
.../MRF_MockupResults_OVC-HEV_Lorry.xml | 10 +--
.../MRF_MockupResults_PEV_Bus.xml | 1 +
.../MRF_MockupResults_non-OVC-HEV_Bus.xml | 1 +
.../VIF_MockupResults_Conv_Bus.xml | 8 ++-
.../VIF_MockupResults_OVC-HEV_Bus.xml | 9 +--
.../VIF_MockupResults_PEV_Bus.xml | 9 +--
.../VIF_MockupResults_non-OVC-HEV_Bus.xml | 9 +--
13 files changed, 83 insertions(+), 49 deletions(-)
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd
index daba540457..61f827168f 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9" xmlns:dd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" targetNamespace="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" schemaLocation="VectoDeclarationDefinitions.2.0.xsd"/>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd
index d9f3f89655..e3dc08c91f 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2016 rel. 2 sp1 (x64) (http://www.altova.com) by Helmut Eichlseder (TU Graz/Inst. f. VKM und THD) -->
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:mrf="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:dd="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9" elementFormDefault="qualified" attributeFormDefault="unqualified">
<!-- Imports_______________________________________________ -->
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" schemaLocation="VectoDeclarationDefinitions.1.0.xsd"/>
@@ -1542,12 +1542,12 @@
</xs:simpleType>
</xs:attribute>
</xs:complexType>
- <xs:complexType name="ResultSuccessOCVHEVType">
+ <xs:complexType name="ResultSuccessOVCHEVType">
<xs:complexContent>
<xs:extension base="mrf:AbstractResultType">
<xs:sequence>
<xs:group ref="mrf:ResultSuccessSimulationParametersGroup"/>
- <xs:element name="OCVMode" minOccurs="2" maxOccurs="2">
+ <xs:element name="OVCMode" minOccurs="2" maxOccurs="2">
<xs:complexType>
<xs:sequence>
<xs:element name="VehiclePerformance" type="mrf:VehiclePerformanceType"/>
@@ -1702,6 +1702,7 @@
</xs:annotation>
</xs:element>
<xs:element name="SimulationParameters" type="mrf:SimulationParametersType"/>
+ <xs:element name="VehicleGroup" type="xs:string"/>
<xs:element name="Error" type="xs:string"/>
<xs:element name="ErrorDetails" type="xs:string"/>
</xs:sequence>
@@ -2116,6 +2117,7 @@
</xs:complexType>
</xs:element>
<xs:element name="SimulationParameters" type="mrf:SimulationParametersType"/>
+ <xs:element name="VehicleGroup" type="xs:string" minOccurs="0"/>
</xs:sequence>
</xs:group>
<xs:complexType name="EnergyConsumptionType">
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
index 26cf16e9b4..53fc7b431c 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Franz Josef Kober (Technische Universität Graz) -->
+<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vectoParam="urn:tugraz:ivt:VectoAPI:ParameterDocumentation" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v1.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xmlns:out="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" xmlns:common="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" targetNamespace="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" elementFormDefault="qualified" attributeFormDefault="unqualified" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:ParameterDocumentation ParameterDocumentation.xsd">
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationOutputDefinitions" schemaLocation="VectoOutputDefinitions.xsd"/>
<xs:import namespace="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions" schemaLocation="VectoDeclarationDefinitions.xsd"/>
@@ -2254,25 +2254,15 @@
</xs:element>
<xs:element name="SimulationParameters" type="vif:SimulationParametersType"/>
<xs:choice>
- <xs:sequence>
- <xs:element name="Fuel" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="EnergyConsumption" type="vif:EnergyConsumptionType" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>I.2.3.1 - I.2.3.12 / #69</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="type" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="CO2" type="vif:CO2Type" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>I.2.3.13 - I.2.3.16 / #68</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
+ <xs:group ref="vif:ResultPrimaryVehicleGroup"/>
+ <xs:element name="OVCMode" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:group ref="vif:ResultPrimaryVehicleGroup"/>
+ </xs:sequence>
+ <xs:attribute name="type" use="required"/>
+ </xs:complexType>
+ </xs:element>
<xs:sequence>
<xs:element name="Error" type="xs:string"/>
<xs:element name="ErrorDetails" type="xs:string"/>
@@ -3005,4 +2995,36 @@
</xs:group>
<!--Components-->
<!--VehicleVIFType-->
+ <xs:group name="ResultPrimaryVehicleGroup">
+ <xs:sequence>
+ <xs:element name="Fuel" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="EnergyConsumption" type="vif:EnergyConsumptionType" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>I.2.3.1 - I.2.3.12 / #69</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="type" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ElectricEnergyConsumption" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="EnergyConsumption" type="vif:EnergyConsumptionType" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>I.2.3.1 - I.2.3.12 / #69</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CO2" type="vif:CO2Type" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>I.2.3.13 - I.2.3.16 / #68</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:group>
</xs:schema>
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
index d3e3c42ff7..7e01464918 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
@@ -13,6 +13,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<Payload unit="kg">2600</Payload>
<PassengerCount>13.75</PassengerCount>
</SimulationParameters>
+ <VehicleGroup>Pxx</VehicleGroup>
<Total>
<VehiclePerformance>
<AverageSpeed unit="km/h">1.2</AverageSpeed>
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Error.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Error.xml
index f99c99dda3..8674b89b03 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Error.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Error.xml
@@ -12,6 +12,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<Payload unit="kg">2600</Payload>
<PassengerCount>13.75</PassengerCount>
</SimulationParameters>
+ <VehicleGroup>Pxx</VehicleGroup>
<Error>7 (LongHaul LowLoading) - absTime: 45.8061 [s], distance: 575.8976 [m], dt: 0.4990 [s], v: 23.6111 [m/s], Gear: 8 | AxleGear LossMap data was extrapolated in Declaration Mode: range for loss map is not sufficient: n:568.520042003599, torque:983.0149 [Nm]</Error>
<ErrorDetails> at TUGraz.VectoCore.Models.SimulationComponent.Impl.TransmissionComponent.DoCommitSimulationStep() in E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Models\SimulationComponent\Impl\TransmissionComponent.cs:line 118
at TUGraz.VectoCore.Models.SimulationComponent.VectoSimulationComponent.CommitSimulationStep(IModalDataContainer container) in E:\QUAM\Workspace\VECTO_quam\VectoCore\VectoCore\Models\SimulationComponent\VectoSimulationComponent.cs:line 67
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
index a757be0225..62d775c33b 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
@@ -5,7 +5,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<Results>
<Status>success</Status>
<!-- OCV HEV (and OCV FCV in future) Bus -->
- <Result status="success" xsi:type="ResultSuccessOCVHEVType">
+ <Result status="success" xsi:type="ResultSuccessOVCHEVType">
<Mission>Long Haul</Mission>
<Distance unit="km">100.185</Distance>
<SimulationParameters>
@@ -13,7 +13,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<Payload unit="kg">2600</Payload>
<PassengerCount>13.75</PassengerCount>
</SimulationParameters>
- <OCVMode type="charge depleting">
+ <VehicleGroup>Pxx</VehicleGroup>
+ <OVCMode type="charge depleting">
<VehiclePerformance>
<AverageSpeed unit="km/h">1.0</AverageSpeed>
<AverageDrivingSpeed unit="km/h">1.1</AverageDrivingSpeed>
@@ -47,8 +48,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
</ElectricEnergy>
<CO2 unit="g/km">5.1</CO2>
<CO2 unit="g/p-km">5.2</CO2>
- </OCVMode>
- <OCVMode type="charge sustaining">
+ </OVCMode>
+ <OVCMode type="charge sustaining">
<VehiclePerformance>
<AverageSpeed unit="km/h">1.2</AverageSpeed>
<AverageDrivingSpeed unit="km/h">1.3</AverageDrivingSpeed>
@@ -76,7 +77,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
</Fuel>
<CO2 unit="g/km">8.1</CO2>
<CO2 unit="g/p-km">8.2</CO2>
- </OCVMode>
+ </OVCMode>
<Total>
<VehiclePerformance>
<AverageSpeed unit="km/h">1.2</AverageSpeed>
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
index 4148ecd570..e3f1c79e9d 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
@@ -5,14 +5,14 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<Results>
<Status>success</Status>
<!-- OCV HEV (and OCV FCV in future) Lorry -->
- <Result status="success" xsi:type="ResultSuccessOCVHEVType">
+ <Result status="success" xsi:type="ResultSuccessOVCHEVType">
<Mission>Long Haul</Mission>
<Distance unit="km">100.185</Distance>
<SimulationParameters>
<TotalVehicleMass unit="kg">17200</TotalVehicleMass>
<Payload unit="kg">2600</Payload>
</SimulationParameters>
- <OCVMode type="charge depleting">
+ <OVCMode type="charge depleting">
<VehiclePerformance>
<AverageSpeed unit="km/h">1.0</AverageSpeed>
<AverageDrivingSpeed unit="km/h">1.1</AverageDrivingSpeed>
@@ -52,8 +52,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<CO2 unit="g/km">5.1</CO2>
<CO2 unit="g/t-km">5.3</CO2>
<CO2 unit="g/m³-km">5.4</CO2>
- </OCVMode>
- <OCVMode type="charge sustaining">
+ </OVCMode>
+ <OVCMode type="charge sustaining">
<VehiclePerformance>
<AverageSpeed unit="km/h">1.2</AverageSpeed>
<AverageDrivingSpeed unit="km/h">1.3</AverageDrivingSpeed>
@@ -85,7 +85,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<CO2 unit="g/km">8.1</CO2>
<CO2 unit="g/t-km">8.3</CO2>
<CO2 unit="g/m³-km">8.4</CO2>
- </OCVMode>
+ </OVCMode>
<Total>
<VehiclePerformance>
<AverageSpeed unit="km/h">1.2</AverageSpeed>
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Bus.xml
index 7f932fe292..2fb7263363 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_PEV_Bus.xml
@@ -13,6 +13,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<Payload unit="kg">2600</Payload>
<PassengerCount>13.75</PassengerCount>
</SimulationParameters>
+ <VehicleGroup></VehicleGroup>
<Total>
<VehiclePerformance>
<AverageSpeed unit="km/h">1.2</AverageSpeed>
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
index 5d50add3f2..7bcc6f06b8 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
@@ -13,6 +13,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
<Payload unit="kg">2600</Payload>
<PassengerCount>13.75</PassengerCount>
</SimulationParameters>
+ <VehicleGroup>Pxxx</VehicleGroup>
<Total>
<VehiclePerformance>
<AverageSpeed unit="km/h">1.2</AverageSpeed>
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_Conv_Bus.xml b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_Conv_Bus.xml
index 23dfe4b699..769cf42ce5 100644
--- a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_Conv_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_Conv_Bus.xml
@@ -1,10 +1,12 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPIDeclarationOutput:VehicleInterimFile:v0.1">
+<?xml version="1.0" encoding="utf-8" ?>
+<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputMultistep.0.1.xsd">
<Results>
<Status>success</Status>
<Result status="success">
<VehicleGroup>GRP</VehicleGroup>
- <Mission>MISSION</Mission>
+ <Mission>Long Haul</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15000</TotalVehicleMass>
<Payload unit="kg">15000</Payload>
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml
index de105b0e08..92593e95b5 100644
--- a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_OVC-HEV_Bus.xml
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationPutput:VehicleInterimFile:v0.1" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationPutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPIDeclarationOutput:VehicleInterimFile:v0.1">
+<?xml version="1.0" encoding="utf-8" ?>
+<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputMultistep.0.1.xsd">
<Results>
<Status>success</Status>
<Result status="success">
<VehicleGroup>GRP</VehicleGroup>
- <Mission>MISSION</Mission>
+ <Mission>Long Haul</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15000</TotalVehicleMass>
<Payload unit="kg">15000</Payload>
<PassengerCount>2</PassengerCount>
- <Fuelmode>single fuel mode</Fuelmode>
+ <FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<OVCMode type="charge depleting">
<Fuel type="NG CI">
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_PEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_PEV_Bus.xml
index 0cfc83ffd3..8bc10de87c 100644
--- a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_PEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_PEV_Bus.xml
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationPutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPIDeclarationOutput:VehicleInterimFile:v0.1">
+<?xml version="1.0" encoding="utf-8" ?>
+<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputMultistep.0.1.xsd">
<Results>
<Status>success</Status>
<Result status="success">
<VehicleGroup>GRP</VehicleGroup>
- <Mission>MISSION</Mission>
+ <Mission>Long Haul</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15000</TotalVehicleMass>
<Payload unit="kg">15000</Payload>
<PassengerCount>2</PassengerCount>
- <Fuelmode>single fuel mode</Fuelmode>
+ <FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<ElectricEnergyConsumption>
<EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
diff --git a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml
index dccac82239..fa303a1b49 100644
--- a/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/VIF_MockupResults_non-OVC-HEV_Bus.xml
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationPutput:VehicleInterimFile:v0.1" xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationPutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPIDeclarationOutput:VehicleInterimFile:v0.1">
+<?xml version="1.0" encoding="utf-8" ?>
+<vif:VectoMockResults xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+xmlns:vif="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputMultistep.0.1.xsd">
<Results>
<Status>success</Status>
<Result status="success">
<VehicleGroup>GRP</VehicleGroup>
- <Mission>MISSION</Mission>
+ <Mission>Long Haul</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15000</TotalVehicleMass>
<Payload unit="kg">15000</Payload>
<PassengerCount>2</PassengerCount>
- <Fuelmode>single fuel mode</Fuelmode>
+ <FuelMode>single fuel mode</FuelMode>
</SimulationParameters>
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">20.71050</EnergyConsumption>
--
GitLab