From bc8699916c5110dbca0257cbda06facba0131dbb Mon Sep 17 00:00:00 2001 From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at> Date: Thu, 6 Oct 2022 12:13:39 +0200 Subject: [PATCH] changed OCV to OVC in MRF and CIF XSD Schema --- .../Resources/XSD/VectoOutputCustomer.0.9.xsd | 12 ++++++------ .../Resources/XSD/VectoOutputManufacturer.0.9.xsd | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputCustomer.0.9.xsd index 0b375190eb..9b4b2bbc36 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 v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) --> +<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Michael Krisper (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"/> @@ -1485,12 +1485,12 @@ </xs:simpleType> </xs:attribute> </xs:complexType> - <xs:complexType name="ResultSuccessOCVHEVType"> + <xs:complexType name="ResultSuccessOVCHEVType"> <xs:complexContent> <xs:extension base="AbstractResultType"> <xs:sequence> <xs:group ref="ResultSuccessSimulationParametersGroup"/> - <xs:element name="OCVMode" minOccurs="2" maxOccurs="2"> + <xs:element name="OVCMode" minOccurs="2" maxOccurs="2"> <xs:complexType> <xs:sequence> <xs:element name="AverageSpeed"> @@ -1674,7 +1674,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - <xs:complexType name="ResultSuccessNonOCVHEVType"> + <xs:complexType name="ResultSuccessNonOVCHEVType"> <xs:complexContent> <xs:extension base="ResultSuccessConventionalType"/> </xs:complexContent> @@ -1917,7 +1917,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - <xs:complexType name="ResultSummaryOCVHEVType"> + <xs:complexType name="ResultSummaryOVCHEVType"> <xs:complexContent> <xs:extension base="AbstractResultSummaryType"> <xs:sequence> @@ -2003,7 +2003,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - <xs:complexType name="ResultSummaryNonOCVHEVType"> + <xs:complexType name="ResultSummaryNonOVCHEVType"> <xs:complexContent> <xs:extension base="ResultSummaryConventionalType"/> </xs:complexContent> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd index df6fdc2b69..4f494c932f 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 v2021 (x64) (http://www.altova.com) by Markus Quaritsch (Technische Universität Graz) --> +<!-- edited with XMLSpy v2021 (x64) (http://www.altova.com) by Michael Krisper (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"/> @@ -2111,7 +2111,7 @@ <xs:element name="Total"> <xs:complexType> <xs:sequence> - <xs:element name="VehiclePerformance" type="mrf:VehiclePerformanceOCVTotalType"/> + <xs:element name="VehiclePerformance" type="mrf:VehiclePerformanceOVCTotalType"/> <xs:element name="Fuel" maxOccurs="unbounded"> <xs:complexType> <xs:sequence> @@ -2215,7 +2215,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - <xs:complexType name="ResultSuccessNonOCVHEVType"> + <xs:complexType name="ResultSuccessNonOVCHEVType"> <xs:complexContent> <xs:extension base="mrf:ResultSuccessConventionalType"/> </xs:complexContent> @@ -2564,7 +2564,7 @@ </xs:element> </xs:sequence> </xs:complexType> - <xs:complexType name="VehiclePerformanceOCVTotalType"> + <xs:complexType name="VehiclePerformanceOVCTotalType"> <xs:sequence> <xs:element name="AverageSpeed"> <xs:annotation> -- GitLab