diff --git a/SI_Format.xsd b/SI_Format.xsd index 4ffd5d9fde20d27d79fd26f8e45ec4fd719d5277..e0d9baee1a62c01d004748c986b0364e6b4cb0f6 100644 --- a/SI_Format.xsd +++ b/SI_Format.xsd @@ -2,12 +2,13 @@ <xs:schema version="2.2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://ptb.de/si" xmlns:si="https://ptb.de/si" + xmlns:qudt="http://qudt.org/vocab/" elementFormDefault="qualified"> - + <xs:annotation> <xs:documentation xml:lang="en"> D-SI - Digital System of Units - Copyright (c) 2019 - 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. + Copyright (c) 2018 - 2023 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. This XML Scheme Definition (XSD) is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -21,10 +22,10 @@ You should have received a copy of the GNU Lesser General Public License along with this XSD. If not, see http://www.gnu.org/licenses. - CONTACT: smartcom@ptb.de + CONTACT: daniel.hutzschenreuter@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si D-SI XSD VERSION: 2.2.0 - RELEASE DATA: 2022-01-21 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 </xs:documentation> <xs:documentation xml:lang="en"> @@ -32,12 +33,15 @@ The development of early versions of the XML scheme was part of the research project EMPIR 17IND02 (title: SmartCom). This project (17IND02) has received funding from the EMPIR programme, co-financed by the Participating States and from the European Union's Horizon 2020 research and innovation programme. - The extension to version 2.2.0 received great support from PTB members B. Gloger and J. Jagieniak. + Further development was supported by project GEMIMEG II and PTB. + Finlly, thanks to all developpers from PTB and our partners around the world for fruitful exchange on requirements + and updates. </xs:documentation> </xs:annotation> - - +<!-- ToDo: Check if needed and remove if not needed --> + <xs:import namespace="http://qudt.org/vocab/" schemaLocation="qudt/quantityKind.xsd"/> + <xs:element name="quantityType" type="qudt:quantityKind"/> <!-- ############## D-SI XML ELEMENT DEFINITIONS FOR MEASUREMETN DATA EXCHANGE #################### --> @@ -49,7 +53,7 @@ </xs:documentation> <xs:documentation xml:lang="en"> <![CDATA[ - The following statements of a real quantity are possible. + The following statements of a real quantity are possible. [(m)-mandatory, (o)-optional] 1. Basic measured quantity @@ -57,6 +61,7 @@ (o) - element quantityType (string) (m) - element value (decimal value type) (m) - element unit (string - SI format) + (o) - element significatnDigits (non negative integer) (o) - element dateTime (xs:dateTime) 2. Measured quantity with univariate measurement uncertainty @@ -64,8 +69,15 @@ (o) - element quantityType (string) (m) - element value (decimal value type) (m) - element unit (string - SI format) + (o) - element significatnDigits (non negative integer) (o) - element dateTime (xs:dateTime) - (m) - choice si:expandedUnc or si:coverageInterval for the univaraite uncertainty + (m) - choice si:measurementUncertaintyStandard + or si:measurementUncertaintyExpanded + or si:measurementUncertaintyInterval + + or [deprecated] si:expandedUnc + or [deprecated] si:coverageInterval + for the univaraite uncertainty ]]> </xs:documentation> <xs:documentation xml:lang="en"> @@ -85,6 +97,102 @@ </xs:annotation> </xs:element> + <xs:complexType name="realQuantityType"> + <xs:sequence> + <!-- optional label and quantity type--> + <xs:element name="label" type="xs:string" minOccurs="0"/> + <!-- check this line --> + <xs:element name="quantityType" type="qudt:quantityKind" minOccurs="0"/> + + <!-- mandatory information --> + <xs:element name="value" type="si:decimalType"/> + <xs:element name="unit" type="si:unitType"/> + + <!-- optional time stamp and significant digits --> + <xs:element name="significantDigits" type="si:significantDigitsType" minOccurs="0"/> + <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/> + + <!-- optional choice of uncertainty statements --> + <xs:choice minOccurs="0"> + <xs:annotation> + <xs:documentation xml:lang="en"> + univariate measurement uncertainty + </xs:documentation> + </xs:annotation> + <xs:element name="measurementUncertaintyStandard" type="si:measurementUncertaintyStandardType"/> + <xs:element name="measurementUncertaintyExpanded" type="si:measurementUncertaintyExpandedType"/> + <xs:element name="measurementUncertaintyInterval" type="si:measurementUncertaintyIntervalType"/> + <!-- deprecated types --> + <xs:element name="expandedUnc" type="si:expandedUncType"/> + <xs:element name="coverageInterval" type="si:coverageIntervalType"/> + </xs:choice> + + </xs:sequence> + </xs:complexType> + + + + <xs:complexType name="measurementUncertaintyStandardType"> + <xs:annotation> + <xs:documentation xml:lang="en">Definition of standard measurement uncertainty data.</xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="valueStandardMU" type="si:valueStandardMUType"/> + <xs:element name="distribution" type="si:distributionType" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="measurementUncertaintyExpandedType"> + <xs:annotation> + <xs:documentation xml:lang="en">Definition of expanded measurement uncertainty data.</xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="valueExpandedMU" type="si:valueExpandedMUType"/> + <xs:element name="coverageFactor" type="si:kValueType"/> + <xs:element name="coverageProbability" type="si:probabilityValueType"/> + <xs:element name="distribution" type="si:distributionType" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="measurementUncertaintyIntervalType"> + <xs:annotation> + <xs:documentation xml:lang="en">Definition of coverage interval measurement uncertainty data.</xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="valueStandardMU" type="si:valueStandardMUType"/> + <xs:element name="intervalMin" type="si:intervalMinType"/> + <xs:element name="intervalMax" type="si:intervalMaxType"/> + <xs:element name="coverageProbability" type="si:probabilityValueType"/> + <xs:element name="distribution" type="si:distributionType" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="expandedUncType"> + <xs:annotation> + <xs:documentation xml:lang="en">[deprecated element] use si:measurementUncertaintyExpanded</xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="uncertainty" type="si:uncertaintyValueType"/> + <xs:element name="coverageFactor" type="si:kValueType"/> + <xs:element name="coverageProbability" type="si:probabilityValueType"/> + <xs:element name="distribution" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + + <xs:complexType name="coverageIntervalType"> + <xs:annotation> + <xs:documentation xml:lang="en">[deprecated element] use si:measurementUncertaintyInterval</xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="standardUnc" type="si:uncertaintyValueType"/> + <xs:element name="intervalMin" type="si:decimalType"/> + <xs:element name="intervalMax" type="si:decimalType"/> + <xs:element name="coverageProbability" type="si:probabilityValueType"/> + <xs:element name="distribution" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + <xs:element name="constant" type="si:constantQuantityType"> <xs:annotation> @@ -100,8 +208,9 @@ (o) - element quantityType (string) (m) - element value (decimal value type) (m) - element unit (string - SI unit) + (o) - element significatnDigits (non negative integer) (o) - element dateTime (xs:dateTime) - (o) - element uncertainty (decimal value >= 0) + (o) - element valueStandardMU (decimal value >= 0) (o) - element distribution (string) The value and the uncertainty have the unit specified by the element unit. @@ -117,7 +226,33 @@ </xs:element> - <xs:element name="complex" type="si:complexQuantityType"> + <xs:complexType name="constantQuantityType"> + <xs:sequence> + <!-- optional label and quantity type--> + <xs:element name="label" type="xs:string" minOccurs="0"/> + <xs:element name="quantityType" type="xs:string" minOccurs="0"/> + + <!-- mandatory information --> + <xs:element name="value" type="si:decimalType"/> + <xs:element name="unit" type="si:unitType"/> + + <!-- optional time stamp and significatn digits --> + <xs:element name="significantDigits" type="si:significantDigitsType" minOccurs="0"/> + <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/> + + <!-- optional uncertainty --> + <xs:element name="valueStandardMU" type="si:valueStandardMUType" minOccurs="0"/> + + <!-- deprecated element standardUnc: use valueStandardMU instead --> + <xs:element name="uncertainty" type="si:uncertaintyValueType" minOccurs="0"/> + + <!-- optional distribution --> + <xs:element name="distribution" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + + <xs:element name="complex" type="si:complexQuantityType"> <xs:annotation> <xs:documentation xml:lang="en"> The definition of complex quantities in the D-SI metadata model. @@ -174,6 +309,113 @@ </xs:element> + <xs:complexType name="complexQuantityType"> + <xs:sequence> + <!-- optional label and quantity type--> + <xs:element name="label" type="xs:string" minOccurs="0"/> + <xs:element name="quantityType" type="xs:string" minOccurs="0"/> + + <!-- choice of Cartesian coordinate form or polar coordinate form --> + <xs:choice> + <xs:sequence> + <!-- mandatory components of Cartesian coordinate form --> + <xs:element name="valueReal" type="si:decimalType"/> + <xs:element name="valueImag" type="si:decimalType"/> + <xs:element name="unit" type="si:unitType"/> + </xs:sequence> + <xs:sequence> + <!-- mandatory components of polar coordinate form --> + <xs:element name="valueMagnitude" type="si:decimalType"/> + <xs:element name="valuePhase" type="si:decimalType"/> + <xs:element name="unit" type="si:unitType"/> + <xs:element name="unitPhase" type="si:unitPhaseType"/> + </xs:sequence> + </xs:choice> + <!-- optional time stamp --> + <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/> + + <!-- optional uncertainty statement: either ellipsoidal or rectangular coverage region --> + <xs:choice minOccurs="0"> + <xs:annotation> + <xs:documentation xml:lang="en"> + bivariate measurement uncertainty + </xs:documentation> + </xs:annotation> + <xs:element name="ellipsoidalRegion" type="si:ellipsoidalRegionType"/> + <xs:element name="rectangularRegion" type="si:rectangularRegionType"/> + </xs:choice> + + </xs:sequence> + </xs:complexType> + + + <xs:complexType name="ellipsoidalRegionType"> + <xs:sequence> + <!-- covariance matrix data --> + <xs:element name="covarianceMatrix" type="si:covarianceMatrixType"/> + <!-- coverage properties of region --> + <xs:element name="coverageFactor" type="si:kValueType"/> + <xs:element name="coverageProbability" type="si:probabilityValueType"/> + <!-- optional information about distribution --> + <xs:element name="distribution" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + + <xs:complexType name="rectangularRegionType"> + <xs:sequence> + <!-- covariance matrix data --> + <xs:element name="covarianceMatrix" type="si:covarianceMatrixType"/> + <!-- coverage properties of region --> + <xs:element name="coverageFactor" type="si:kValueType"/> + <xs:element name="coverageProbability" type="si:probabilityValueType"/> + <!-- optional information about distribution --> + <xs:element name="distribution" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + + <xs:complexType name="covarianceMatrixType"> + <xs:sequence> + <xs:element name="column" minOccurs="1" maxOccurs="unbounded"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Definition of a column in the covariance matrix. + </xs:documentation> + <xs:documentation xml:lang="en"> + <![CDATA[ + The column has n covariance elements, where + n is the amount of columns in the covariance matrix. + + The covariance elements are ordered as in the covariance matrix, started + at the element in the first row of the matrix and going to the + last row of the matrix. + ]]> + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element name="covariance" minOccurs="1" maxOccurs="unbounded"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Each covariance component is defined by + - element value (decimal value type) + - element unit (string - SI format) + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element name="value" type="si:decimalType"/> + <xs:element name="unit" type="si:unitType"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + <xs:element name="realList" type="si:realListType"> <xs:annotation> <xs:documentation xml:lang="en"> @@ -191,340 +433,377 @@ </xs:documentation> </xs:annotation> </xs:element> + + + <xs:complexType name="realListType"> + <xs:sequence> + <!-- optional label of the list--> + <xs:element name="label" type="xs:string" minOccurs="0"/> + <!-- optional list time stamp --> + <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/> + <!-- optional list quantityType --> + <xs:element name="listQuantityType" type="xs:string" minOccurs="0"/> + <!-- optional list unit --> + <xs:element name="listUnit" type="si:unitType" minOccurs="0"/> + <!-- optional list significant digits --> + <xs:element name="listSignificantDigits" type="si:significantDigitsType" minOccurs="0"/> + <!-- optional list uncertainty --> + + <xs:element name="listMeasurementUncertaintyUnivariate" type="si:listMeasurementUncertaintyUnivariateType" minOccurs="0"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Definition of a structure, for a global univariate uncertainty, that + is used within the list structure with a list of real quantities. + The global univariate uncertainty can either be given as an expanded + measurement uncertainty or as a coverage interval. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="listUnivariateUnc" type="si:listUnivariateUncType" minOccurs="0"> + <xs:annotation> + <xs:documentation xml:lang="en">[deprecated element] use listMeasurementUncertaintyUnivariate instead</xs:documentation> + </xs:annotation> + </xs:element> + + <!-- mandatory list of real elements --> + <xs:element name="real" type="si:realInListType" maxOccurs="unbounded"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Meta data element definition for a real measurement quantity in list. + This implementation differs from the pure real quantity in the way that + the unit component is optional in order to allow a combination with + a global unit in the list of real quantities. + </xs:documentation> + </xs:annotation> + </xs:element> + <!-- optional multivariate uncertainty statement --> + <xs:choice minOccurs="0"> + <xs:annotation> + <xs:documentation xml:lang="en"> + multivariate measurement uncertainty + </xs:documentation> + </xs:annotation> + <xs:element name="ellipsoidalRegion" type="si:ellipsoidalRegionType"/> + <xs:element name="rectangularRegion" type="si:rectangularRegionType"/> + </xs:choice> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="realInListType"> + <xs:sequence> + <!-- optional local label and local quantity type--> + <xs:element name="label" type="xs:string" minOccurs="0"/> + <xs:element name="quantityType" type="xs:string" minOccurs="0"/> + + <!-- mandatory information --> + <xs:element name="value" type="si:decimalType"/> + <!-- if list unit, then do not write this local unit --> + <xs:element name="unit" type="si:unitType" minOccurs="0"/> + <!-- optional local time stamp and significatn digits --> + <xs:element name="significantDigits" type="si:significantDigitsType" minOccurs="0"/> + <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/> + <!-- optional choice of local uncertainty statements --> + <xs:choice minOccurs="0"> + <xs:annotation> + <xs:documentation xml:lang="en">univariate measurement uncertainty</xs:documentation> + </xs:annotation> + <xs:element name="measurementUncertaintyStandard" type="si:measurementUncertaintyStandardType"/> + <xs:element name="measurementUncertaintyExpanded" type="si:measurementUncertaintyExpandedType"/> + <xs:element name="measurementUncertaintyInterval" type="si:measurementUncertaintyIntervalType"/> + <!-- deprecated types --> + <xs:element name="expandedUnc" type="si:expandedUncType"/> + <xs:element name="coverageInterval" type="si:coverageIntervalType"/> + </xs:choice> + </xs:sequence> + </xs:complexType> - <xs:element name="realListXMLList" type="si:realListXMLListType"> - <xs:annotation> - <xs:documentation xml:lang="en"> - Meta data element definition for a list of real measurement quantities based on - the XML type xsd:list. The list can represent independent measurement or multivariate - vector quantities. The listed data is separated by blank spaces allowing a memory - saving implementation of large data sets. - </xs:documentation> - <xs:documentation xml:lang="en"> - <![CDATA[ - A list can provide the following structures: - - list of one ore more si:value elements separated by blank spaces - - optional list timestamp, list label, and/or list unit - - optional list univariate uncertainty statement with list unit - - optional multivariate hyper-elliptical or hyper-rectangular coverage region - ]]> - </xs:documentation> - </xs:annotation> - </xs:element> - - <xs:element name="complexList" type="si:complexListType"> - <xs:annotation> - <xs:documentation xml:lang="en"> - Meta data element definition for a list of complex measurement quantities. - The list can represent independent measurement or multivariate vector quantities. - </xs:documentation> - <xs:documentation xml:lang="en"> - <![CDATA[ - This list can provide the following structures: - - list of one ore more si:complex elements - - optional list timestamp, list label, and/or list unit(s) - - optional list bivariate uncertainty statement with list unit(s) - - optional multivariate hyper-elliptical or hyper-rectangular coverage region - ]]> - </xs:documentation> - </xs:annotation> - </xs:element> - - <xs:element name="list" type="si:listType"> - <xs:annotation> - <xs:documentation xml:lang="en"> - Meta data element definition for a list of basic measurement quantities. - The list can represent independent measurement or multivariate vector quantities. - </xs:documentation> - <xs:documentation xml:lang="en"> - <![CDATA[ - This list can provide the following nested structures: - - si:list elements and - - si:realList elements and - - si:complexList elements - ]]> - </xs:documentation> - </xs:annotation> - </xs:element> - - - - <!-- ############## D-SI XML ELEMENT DEFINITIONS FOR HYBRID ELEMENTS #################### --> - <xs:element name="hybrid" type="si:hybridType"> - <xs:annotation> - <xs:documentation xml:lang="en"> - The hybrid elements allows to add quantities to the - machine readable D-SI format, with other units, than those allowed - to be used with the SI by means of the BIPM SI brochure. - </xs:documentation> - <xs:documentation xml:lang="en"> - <![CDATA[ - The hybrid element can contain the following information - - 1. A set of real quantities - - all real elements provide a quantity value for one and the same measured quantity - - each real element provides this quantity with a different unit - - at least one real element provides the quantity with a machine readable SI unit - - the other real quantities can use any SI or non-SI unit - - 2. A set of complex quantities - - all complex elements provide a quantity value for one and the same measured quantity - - each complex element provides this quantity with a different unit(s) - - at least one complex element provides the quantity with a machine readable SI unit(s) - - the other complex quantities can use any SI or non-SI unit - - 3. A set of list elements - - all list elements must provide the same quantity information and hence, must have - an identical structure. - - the lists do only differ by using different units for each of the quantities - - at least one list provides all quantities only with machine readable SI units - - the other lists can use any other units for the quantities - - Applicable list types are si:list, si:realList, si:complexList and si:realListXMLList. - - 4. A set of constant quantities - - all constant elements provide a quantity value for one and the same quantity - - each constant element provides this quantity with a different unit - - at least one constant element provides the quantity with a machine readable SI unit - - the other constant quantities can use any SI or non-SI unit - ]]> - </xs:documentation> - </xs:annotation> - </xs:element> + <xs:complexType name="listMeasurementUncertaintyUnivariateType"> + <xs:choice> + <xs:annotation> + <xs:documentation xml:lang="en">univariate measurement uncertainty</xs:documentation> + </xs:annotation> + <xs:element name="measurementUncertaintyStandard" type="si:measurementUncertaintyStandardType"/> + <xs:element name="measurementUncertaintyExpanded" type="si:measurementUncertaintyExpandedType"/> + <xs:element name="measurementUncertaintyInterval" type="si:measurementUncertaintyIntervalType"/> + <!-- deprecated types --> + <xs:element name="expandedUnc" type="si:expandedUncType"/> + <xs:element name="coverageInterval" type="si:coverageIntervalType"/> + </xs:choice> + </xs:complexType> - <!-- ############## D-SI SUPPLEMENTAL XML ELEMENT DEFINITIONS #################### --> - - <xs:element name="expandedUnc" type="si:expandedUncType"> + <xs:complexType name="listUnivariateUncType"> + <xs:annotation> + <xs:documentation xml:lang="en">[deprecated type] use listMeasurementUncertaintyUnivariateType instead</xs:documentation> + </xs:annotation> + <xs:choice> + <xs:element name="expandedUnc" type="si:expandedUncType"/> + <xs:element name="coverageInterval" type="si:coverageIntervalType"/> + </xs:choice> + </xs:complexType> + + + <xs:element name="realListXMLList" type="si:realListXMLListType"> <xs:annotation> <xs:documentation xml:lang="en"> - Definition of the structure, that gives the necessary components for stating - an expanded measurement uncertainty. This element must always be used in the - context of a real quantity, which is an application within si:real and/or - si:globalUnivariateUnc. + Meta data element definition for a list of real measurement quantities based on + the XML type xsd:list. The list can represent independent measurement or multivariate + vector quantities. The listed data is separated by blank spaces allowing a memory + saving implementation of large data sets. </xs:documentation> <xs:documentation xml:lang="en"> <![CDATA[ - The element has the following components [(m)-mandatory, (o)-optional]: - - (m) - element uncertainty (decimal value >= 0, THE EXPANDED UNCERTAINTY VALUE!) - (m) - element coverageFactor (decimal value >= 1) - (m) - element coverageProbability (decimal value in [0,1]) - (o) - element distribution (string) - - The unit of component uncertainty is the unit used in the context of - si:real and/or si:globalUnivariateUnc. + A list can provide the following structures: + - list of one ore more si:value elements separated by blank spaces + - optional list timestamp, list label, and/or list unit + - optional list univariate uncertainty statement with list unit + - optional multivariate hyper-elliptical or hyper-rectangular coverage region ]]> </xs:documentation> </xs:annotation> </xs:element> - <xs:element name="coverageInterval" type="si:coverageIntervalType"> - <xs:annotation> - <xs:documentation xml:lang="en"> - Definition of the structure, that gives the necessary components for stating - a probabilistic-symmetric coverage interval for a real uncertainty. This element - must always be used in the context of a real quantity, which is an application - within si:real and/or si:globalUnivariateUnc. - </xs:documentation> - <xs:documentation xml:lang="en"> - <![CDATA[ - The element has the following components [(m)-mandatory, (o)-optional]: + <xs:complexType name="realListXMLListType"> + <xs:sequence> + <!-- optional label and quantity type--> + <xs:element name="labelXMLList" type="si:stringXMLListType" minOccurs="0"/> + <xs:element name="quantityTypeXMLList" type="si:stringXMLListType" minOccurs="0"/> + + <!-- mandatory information --> + <xs:element name="valueXMLList" type="si:decimalXMLListType"/> + <xs:element name="unitXMLList" type="si:unitXMLListType"/> + + <!-- optional time stamp --> + <xs:element name="significantDigitsXMLList" type="si:significantDigitsXMLListType" minOccurs="0"/> + <xs:element name="dateTimeXMLList" type="si:dateTimeXMLListType" minOccurs="0"/> + + <!-- optional choice of uncertainty statements --> + <xs:choice minOccurs="0"> + <xs:annotation> + <xs:documentation xml:lang="en">univariate measurement uncertainty</xs:documentation> + </xs:annotation> + <xs:element name="measurementUncertaintyStandardXMLList" type="si:measurementUncertaintyStandardXMLListType"/> + <xs:element name="measurementUncertaintyExpandedXMLList" type="si:measurementUncertaintyExpandedXMLListType"/> + <xs:element name="measurementUncertaintyIntervalXMLList" type="si:measurementUncertaintyIntervalXMLListType"/> + <!-- deprecated types --> + <xs:element name="expandedUncXMLList" type="si:expandedUncXMLListType"/> + <xs:element name="coverageIntervalXMLList" type="si:coverageIntervalXMLListType"/> + </xs:choice> + + <xs:choice minOccurs="0"> + <xs:annotation> + <xs:documentation xml:lang="en">multivariate measurement uncertainty</xs:documentation> + </xs:annotation> - (m) - element stdUncertainty (decimal value >= 0) - (m) - element intervalMin (decimal value type) - (m) - element intervalMax (decimal value type) - (m) - element coverageProbability (decimal value in [0,1]) - (o) - element distribution (string) + <xs:element name="mUncMultivarEllipsoidalXMLList" type="si:measurementUncertaintyEllipsoidalXMLListType"/> + <xs:element name="mUncMultivarRectangularXMLList" type="si:measurementUncertaintyRectangularXMLListType"/> - The unit of components stdUncertainty, intervalMin and intervalMax is the unit - used in the context of si:real and/or si:globalUnivaraiteUnc. - ]]> - </xs:documentation> + <!-- [deprecated elements] use mUncMultivarEllipsoidalXMLList or mUncMultivarRectangularXMLList instead --> + <xs:element name="ellipsoidalRegionXMLList" type="si:ellipsoidalRegionType"/> + <xs:element name="rectangularRegionXMLList" type="si:rectangularRegionType"/> + </xs:choice> + </xs:sequence> + </xs:complexType> + + + <xs:complexType name="measurementUncertaintyStandardXMLListType"> + <xs:annotation> + <xs:documentation xml:lang="en">Definition of standard measurement uncertainty data.</xs:documentation> </xs:annotation> - </xs:element> + <xs:sequence> + <xs:element name="valueStandardMUXMLList" type="si:uncertaintyValueXMLListType"/> + <xs:element name="distributionXMLList" type="si:distributionXMLListType" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="measurementUncertaintyExpandedXMLListType"> + <xs:annotation> + <xs:documentation xml:lang="en">Definition of expanded measurement uncertainty data.</xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="valueExpandedMUXMLList" type="si:uncertaintyValueXMLListType"/> + <xs:element name="coverageFactorXMLList" type="si:kValueXMLListType"/> + <xs:element name="coverageProbabilityXMLList" type="si:probabilityValueXMLListType"/> + <xs:element name="distributionXMLList" type="si:distributionXMLListType" minOccurs="0"/> + </xs:sequence> + </xs:complexType> - <!-- D-SI XML ELEMENT DEFINITIONS FOR COVARIANCE MATRIX ELEMENT --> - <xs:element name="covarianceMatrix" type="si:covarianceMatrixType"> - <xs:annotation> - <xs:documentation xml:lang="en"> - Definition of a covariance matrix element that is used for - multidimensional uncertainty statements in the D-SI format. - </xs:documentation> - <xs:documentation xml:lang="en"> - <![CDATA[ - A covariance matrix has n column elements. - The dimension of the covariance matrix is the amount of columns. - Each column contains the covariance values of one column of the - covariance matrix. - The order of the columns is from left to right column in the - covariance matrix. - ]]> - </xs:documentation> + <xs:complexType name="measurementUncertaintyIntervalXMLListType"> + <xs:annotation> + <xs:documentation xml:lang="en">Definition of coverage interval measurement uncertainty data.</xs:documentation> </xs:annotation> - </xs:element> + <xs:sequence> + <xs:element name="valueStandardMUXMLList" type="si:uncertaintyValueXMLListType"/> + <xs:element name="intervalMinXMLList" type="si:intervalMinXMLListType"/> + <xs:element name="intervalMaxXMLList" type="si:intervalMaxXMLListType"/> + <xs:element name="coverageProbabilityXMLList" type="si:probabilityValueXMLListType"/> + <xs:element name="distributionXMLList" type="si:distributionXMLListType" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + <xs:complexType name="expandedUncXMLListType"> + <xs:annotation> + <xs:documentation xml:lang="en">[deprecated type] use si:measurementUncertaintyExpandedXMLListType </xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="uncertaintyXMLList" type="si:uncertaintyValueXMLListType"/> + <xs:element name="coverageFactorXMLList" type="si:kValueXMLListType"/> + <xs:element name="coverageProbabilityXMLList" type="si:probabilityValueXMLListType"/> + <xs:element name="distributionXMLList" type="si:stringXMLListType" minOccurs="0"/> + </xs:sequence> + </xs:complexType> - <xs:element name="ellipsoidalRegion" type="si:ellipsoidalRegionType"> - <xs:annotation> - <xs:documentation xml:lang="en"> - Definition of the structure, that provides a hyper-ellipsoidal coverage - region for stating the uncertainty of multivariate quantities. It is - used in the context of uncertainty for complex quantities and - lists of real or complex quantities. - </xs:documentation> - <xs:documentation xml:lang="en"> - <![CDATA[ - The element has the following components [(m)-mandatory, (o)-optional]: - - (m) - element covarianceMatrix (sub structure covarianceMatrix) - (m) - element coverageFactor (decimal value >= 1) - (m) - element coverageProbability (decimal value in [0,1]) - (o) - element distribution (string) - ]]> - </xs:documentation> + + <xs:complexType name="coverageIntervalXMLListType"> + <xs:annotation> + <xs:documentation xml:lang="en">[deprecated type] use si:measurementUncertaintyIntervalXMLListType</xs:documentation> </xs:annotation> - </xs:element> + <xs:sequence> + <xs:element name="standardUncXMLList" type="si:uncertaintyValueXMLListType"/> + <xs:element name="intervalMinXMLList" type="si:decimalXMLListType"/> + <xs:element name="intervalMaxXMLList" type="si:decimalXMLListType"/> + <xs:element name="coverageProbabilityXMLList" type="si:probabilityValueXMLListType"/> + <xs:element name="distributionXMLList" type="si:stringXMLListType" minOccurs="0"/> + </xs:sequence> + </xs:complexType> - <xs:element name="rectangularRegion" type="si:rectangularRegionType"> - <xs:annotation> - <xs:documentation xml:lang="en"> - Definition of the structure that provides a hyper-rectangular coverage - region for stating the uncertainty of multivariate quantities. It is - used in the context of uncertainty for complex quantities and - lists of real or complex quantities. + <xs:complexType name="measurementUncertaintyEllipsoidalXMLListType"> + <xs:sequence> + <!-- covariance matrix data --> + <xs:element name="covarianceMatrixXMLList" type="si:covarianceMatrixXMLListType"/> + <!-- coverage properties of region --> + <xs:element name="coverageFactorXMLList" type="si:kValueXMLListType"/> + <xs:element name="coverageProbabilityXMLList" type="si:probabilityValueXMLListType"/> + <!-- optional information about distribution --> + <xs:element name="distributionXMLList" type="si:distributionXMLListType" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + + <xs:complexType name="measurementUncertaintyRectangularXMLListType"> + <xs:sequence> + <!-- covariance matrix data --> + <xs:element name="covarianceMatrixXMLList" type="si:covarianceMatrixXMLListType"/> + <!-- coverage properties of region --> + <xs:element name="coverageFactorXMLList" type="si:kValueXMLListType"/> + <xs:element name="coverageProbabilityXMLList" type="si:probabilityValueXMLListType"/> + <!-- optional information about distribution --> + <xs:element name="distributionXMLList" type="si:distributionXMLListType" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + + <xs:complexType name="covarianceMatrixXMLListType"> + <xs:sequence> + <xs:element name="columnXMLList" minOccurs="1" maxOccurs="unbounded"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Definition of a column in the covariance matrix. + </xs:documentation> + <xs:documentation xml:lang="en"> + <![CDATA[ + The column has n covariance elements, where + n is the amount of columns in the covariance matrix. + + The covariance elements are ordered as in the covariance matrix, started + at the element in the first row of the matrix and going to the + last row of the matrix. + ]]> + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element name="covarianceXMLList" type="si:covarianceXMLListType" minOccurs="1" maxOccurs="unbounded"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Each covariance component is defined by + - element value (decimal value type) + - element unit (string - SI format) + </xs:documentation> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + + + <xs:complexType name="covarianceXMLListType"> + <xs:sequence> + <xs:element name="valueXMLList" type="si:decimalXMLListType"/> + <xs:element name="unitXMLList" type="si:unitXMLListType"/> + </xs:sequence> + </xs:complexType> + + + <xs:element name="complexList" type="si:complexListType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Meta data element definition for a list of complex measurement quantities. + The list can represent independent measurement or multivariate vector quantities. </xs:documentation> <xs:documentation xml:lang="en"> <![CDATA[ - The element has the following components [(m)-mandatory, (o)-optional]: - - (m) - element covarianceMatrix (sub structure covarianceMatrix) - (m) - element coverageFactor (decimal value >= 1) - (m) - element coverageProbability (decimal value in [0,1]) - (o) - element distribution (string) + This list can provide the following structures: + - list of one ore more si:complex elements + - optional list timestamp, list label, and/or list unit(s) + - optional list bivariate uncertainty statement with list unit(s) + - optional multivariate hyper-elliptical or hyper-rectangular coverage region ]]> </xs:documentation> </xs:annotation> </xs:element> - - <!-- ############## D-SI XML TYPE DEFINITIONS #################### --> - - <xs:complexType name="realQuantityType"> + <xs:complexType name="complexListType"> <xs:sequence> - <!-- optional label and quantity type--> + <!-- optional label of the list --> <xs:element name="label" type="xs:string" minOccurs="0"/> - <xs:element name="quantityType" type="xs:string" minOccurs="0"/> - - <!-- mandatory information --> - <xs:element name="value" type="si:decimalType"/> - <xs:element name="unit" type="si:unitType"/> - - <!-- optional time stamp --> + + <!-- optional list time stamp --> <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/> + <!-- optional list quantityType --> + <xs:element name="listQuantityType" type="xs:string" minOccurs="0"/> + <!-- optional list unit --> + <xs:element name="listUnit" type="si:unitType" minOccurs="0"/> + <xs:element name="listUnitPhase" type="xs:string" minOccurs="0"/> + <!-- optional list bivariate uncertainty --> - <!-- optional choice of uncertainty statements --> - <xs:choice minOccurs="0"> + <xs:element name="listBivariateUnc" type="si:listBivariateUncType" minOccurs="0"> <xs:annotation> <xs:documentation xml:lang="en"> - univariate measurement uncertainty + Definition of a structure, for a global bivariate uncertainty, that + is used within the list structure with a list of complex quantities. + The global bivariate uncertainty can either be given as a hyper-ellipsoidal + coverage region or a hyper-rectangular coverage region. Both + coverage regions must provide a covariance matrix of dimension 2. </xs:documentation> </xs:annotation> - <xs:element name="expandedUnc" type="si:expandedUncType"/> - <xs:element name="coverageInterval" type="si:coverageIntervalType"/> - </xs:choice> - - </xs:sequence> - </xs:complexType> - - - <xs:complexType name="constantQuantityType"> - <xs:sequence> - <!-- optional label and quantity type--> - <xs:element name="label" type="xs:string" minOccurs="0"/> - <xs:element name="quantityType" type="xs:string" minOccurs="0"/> - - <!-- mandatory information --> - <xs:element name="value" type="si:decimalType"/> - <xs:element name="unit" type="si:unitType"/> - - <!-- optional time stamp --> - <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/> - - <!-- optional uncertainty --> - <xs:element name="uncertainty" type="si:uncertaintyValueType" minOccurs="0"/> - - <!-- optional distribution --> - <xs:element name="distribution" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - - - <xs:complexType name="complexQuantityType"> - <xs:sequence> - <!-- optional label and quantity type--> - <xs:element name="label" type="xs:string" minOccurs="0"/> - <xs:element name="quantityType" type="xs:string" minOccurs="0"/> - - <!-- choice of Cartesian coordinate form or polar coordinate form --> - <xs:choice> - <xs:sequence> - <!-- mandatory components of Cartesian coordinate form --> - <xs:element name="valueReal" type="si:decimalType"/> - <xs:element name="valueImag" type="si:decimalType"/> - <xs:element name="unit" type="si:unitType"/> - </xs:sequence> - <xs:sequence> - <!-- mandatory components of polar coordinate form --> - <xs:element name="valueMagnitude" type="si:decimalType"/> - <xs:element name="valuePhase" type="si:decimalType"/> - <xs:element name="unit" type="si:unitType"/> - <xs:element name="unitPhase" type="si:unitPhaseType"/> - </xs:sequence> - </xs:choice> - <!-- optional time stamp --> - <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/> - - <!-- optional uncertainty statement: either ellipsoidal or rectangular coverage region --> - <xs:choice minOccurs="0"> + </xs:element> + <!-- mandatory list of complex elements --> + <xs:element name="complex" type="si:complexInListType" maxOccurs="unbounded"> <xs:annotation> <xs:documentation xml:lang="en"> - bivariate measurement uncertainty + Meta data element definition for a complex measurement quantity in list. + This implementation differs from the pure complex quantity, in the way that + the unit components are optional in order to allow a combination with + a global unit in the list of complex quantities. </xs:documentation> </xs:annotation> - <xs:element name="ellipsoidalRegion" type="si:ellipsoidalRegionType"/> - <xs:element name="rectangularRegion" type="si:rectangularRegionType"/> - </xs:choice> - - </xs:sequence> - </xs:complexType> - - - <xs:complexType name="realInListType"> - <xs:sequence> - <!-- optional local label and local quantity type--> - <xs:element name="label" type="xs:string" minOccurs="0"/> - <xs:element name="quantityType" type="xs:string" minOccurs="0"/> - - <!-- mandatory information --> - <xs:element name="value" type="si:decimalType"/> - <!-- if list unit, then do not write this local unit --> - <xs:element name="unit" type="si:unitType" minOccurs="0"/> - <!-- optional local time stamp --> - <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/> - <!-- optional choice of local uncertainty statements --> + </xs:element> + <!-- optional multivariate uncertainty statement --> <xs:choice minOccurs="0"> <xs:annotation> <xs:documentation xml:lang="en"> - univariate measurement uncertainty + multivariate measurement uncertainty </xs:documentation> </xs:annotation> - <xs:element name="expandedUnc" type="si:expandedUncType"/> - <xs:element name="coverageInterval" type="si:coverageIntervalType"/> + <xs:element name="ellipsoidalRegion" type="si:ellipsoidalRegionType"/> + <xs:element name="rectangularRegion" type="si:rectangularRegionType"/> </xs:choice> </xs:sequence> </xs:complexType> @@ -572,127 +851,75 @@ </xs:complexType> - <xs:complexType name="realListType"> - <xs:sequence> - <!-- optional label of the list--> - <xs:element name="label" type="xs:string" minOccurs="0"/> - <!-- optional list time stamp --> - <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/> - <!-- optional list quantityType --> - <xs:element name="listQuantityType" type="xs:string" minOccurs="0"/> - <!-- optional list unit --> - <xs:element name="listUnit" type="si:unitType" minOccurs="0"/> - <!-- optional list uncertainty --> - - <xs:element name="listUnivariateUnc" type="si:listUnivariateUncType" minOccurs="0"> - <xs:annotation> - <xs:documentation xml:lang="en"> - Definition of a structure, for a global univariate uncertainty, that - is used within the list structure with a list of real quantities. - The global univariate uncertainty can either be given as an expanded - measurement uncertainty or as a coverage interval. - </xs:documentation> - </xs:annotation> - </xs:element> - - <!-- mandatory list of real elements --> - <xs:element name="real" type="si:realInListType" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation xml:lang="en"> - Meta data element definition for a real measurement quantity in list. - This implementation differs from the pure real quantity in the way that - the unit component is optional in order to allow a combination with - a global unit in the list of real quantities. - </xs:documentation> - </xs:annotation> - </xs:element> - <!-- optional multivariate uncertainty statement --> - <xs:choice minOccurs="0"> - <xs:annotation> - <xs:documentation xml:lang="en"> - multivariate measurement uncertainty - </xs:documentation> - </xs:annotation> - <xs:element name="ellipsoidalRegion" type="si:ellipsoidalRegionType"/> - <xs:element name="rectangularRegion" type="si:rectangularRegionType"/> - </xs:choice> - </xs:sequence> + <xs:complexType name="listBivariateUncType"> + <xs:choice minOccurs="0"> + <xs:annotation> + <xs:documentation xml:lang="en"> + bivariate measurement uncertainty + </xs:documentation> + </xs:annotation> + <xs:element name="ellipsoidalRegion" type="si:ellipsoidalRegionType"/> + <xs:element name="rectangularRegion" type="si:rectangularRegionType"/> + </xs:choice> </xs:complexType> - <xs:complexType name="realListXMLListType"> - <xs:sequence> - <!-- optional label and quantity type--> - <xs:element name="labelXMLList" type="si:stringXMLListType" minOccurs="0"/> - <xs:element name="quantityTypeXMLList" type="si:stringXMLListType" minOccurs="0"/> - - <!-- mandatory information --> - <xs:element name="valueXMLList" type="si:decimalXMLListType"/> - <xs:element name="unitXMLList" type="si:unitXMLListType"/> - - <!-- optional time stamp --> - <xs:element name="dateTimeXMLList" type="si:dateTimeXMLListType" minOccurs="0"/> - - <!-- optional choice of uncertainty statements --> - <xs:choice minOccurs="0"> - <xs:annotation> - <xs:documentation xml:lang="en"> - univariate measurement uncertainty - </xs:documentation> - </xs:annotation> - <xs:element name="expandedUncXMLList" type="si:expandedUncXMLListType"/> - <xs:element name="coverageIntervalXMLList" type="si:coverageIntervalXMLListType"/> - </xs:choice> - - <xs:choice minOccurs="0"> - <xs:annotation> - <xs:documentation xml:lang="en"> - multivariate measurement uncertainty - </xs:documentation> - </xs:annotation> - <xs:element name="ellipsoidalRegionXMLList" type="si:ellipsoidalRegionType"/> - <xs:element name="rectangularRegionXMLList" type="si:rectangularRegionType"/> - </xs:choice> - </xs:sequence> - </xs:complexType> + <xs:element name="complexListXMLList" type="si:complexListXMLListType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Meta data element definition for a list of complex measurement quantities. + The list can represent independent measurement or multivariate vector quantities. + The list support blank space sepetrated values. + </xs:documentation> + <xs:documentation xml:lang="en"> + <![CDATA[ + This list can provide the following structures: + - list of one ore more si:complex elements + - optional list timestamp, list label, and/or list unit(s) + - optional list bivariate uncertainty statement with list unit(s) + - optional multivariate hyper-elliptical or hyper-rectangular coverage region + ]]> + </xs:documentation> + </xs:annotation> + </xs:element> - <xs:complexType name="complexListType"> - <xs:sequence> - <!-- optional label of the list --> - <xs:element name="label" type="xs:string" minOccurs="0"/> - - <!-- optional list time stamp --> - <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/> - <!-- optional list quantityType --> - <xs:element name="listQuantityType" type="xs:string" minOccurs="0"/> - <!-- optional list unit --> - <xs:element name="listUnit" type="si:unitType" minOccurs="0"/> - <xs:element name="listUnitPhase" type="xs:string" minOccurs="0"/> - <!-- optional list bivariate uncertainty --> + <xs:complexType name="complexListXMLListType"> + <xs:sequence> + <!-- optional label and quantity type--> + <xs:element name="labelXMLList" type="si:stringXMLListType" minOccurs="0"/> + <xs:element name="quantityTypeXMLList" type="si:stringXMLListType" minOccurs="0"/> - <xs:element name="listBivariateUnc" type="si:listBivariateUncType" minOccurs="0"> - <xs:annotation> - <xs:documentation xml:lang="en"> - Definition of a structure, for a global bivariate uncertainty, that - is used within the list structure with a list of complex quantities. - The global bivariate uncertainty can either be given as a hyper-ellipsoidal - coverage region or a hyper-rectangular coverage region. Both - coverage regions must provide a covariance matrix of dimension 2. - </xs:documentation> - </xs:annotation> - </xs:element> - <!-- mandatory list of complex elements --> - <xs:element name="complex" type="si:complexInListType" maxOccurs="unbounded"> + <!-- choice of Cartesian coordinate form or polar coordinate form --> + <xs:choice> + <xs:sequence> + <!-- mandatory components of Cartesian coordinate form --> + <xs:element name="valueRealXMLList" type="si:decimalXMLListType"/> + <xs:element name="valueImagXMLList" type="si:decimalXMLListType"/> + <xs:element name="unitXMLList" type="si:unitXMLListType"/> + </xs:sequence> + <xs:sequence> + <!-- mandatory components of polar coordinate form --> + <xs:element name="valueMagnitudeXMLList" type="si:decimalXMLListType"/> + <xs:element name="valuePhaseXMLList" type="si:decimalXMLListType"/> + <xs:element name="unitXMLList" type="si:unitXMLListType"/> + <xs:element name="unitPhaseXMLList" type="si:unitPhaseXMLListType"/> + </xs:sequence> + </xs:choice> + <!-- optional time stamp --> + <xs:element name="dateTimeXMLList" type="si:dateTimeXMLListType" minOccurs="0"/> + + <!-- optional uncertainty statement: either ellipsoidal or rectangular coverage region --> + <xs:choice minOccurs="0"> <xs:annotation> <xs:documentation xml:lang="en"> - Meta data element definition for a complex measurement quantity in list. - This implementation differs from the pure complex quantity, in the way that - the unit components are optional in order to allow a combination with - a global unit in the list of complex quantities. + bivariate measurement uncertainty </xs:documentation> </xs:annotation> - </xs:element> + <xs:element name="mUncBivarEllipsoidalXMLList" type="si:measurementUncertaintyEllipsoidalXMLListType"/> + <xs:element name="mUncBivarRectangularXMLList" type="si:measurementUncertaintyRectangularXMLListType"/> + </xs:choice> + <!-- optional multivariate uncertainty statement --> <xs:choice minOccurs="0"> <xs:annotation> @@ -700,13 +927,34 @@ multivariate measurement uncertainty </xs:documentation> </xs:annotation> - <xs:element name="ellipsoidalRegion" type="si:ellipsoidalRegionType"/> - <xs:element name="rectangularRegion" type="si:rectangularRegionType"/> + <xs:element name="mUncMultivarEllipsoidalXMLList" type="si:measurementUncertaintyEllipsoidalXMLListType"/> + <xs:element name="mUncMultivarRectangularXMLList" type="si:measurementUncertaintyRectangularXMLListType"/> </xs:choice> </xs:sequence> </xs:complexType> + + + + <xs:element name="list" type="si:listType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Meta data element definition for a list of basic measurement quantities. + The list can represent independent measurement or multivariate vector quantities. + </xs:documentation> + <xs:documentation xml:lang="en"> + <![CDATA[ + This list can provide the following nested structures: + - si:list elements and + - si:realList elements and + - si:complexList elements + ]]> + </xs:documentation> + </xs:annotation> + </xs:element> + + <xs:complexType name="listType"> <xs:sequence> <!-- optional label of the list --> @@ -718,8 +966,10 @@ <xs:choice maxOccurs="unbounded"> <!-- either list of real --> <xs:element name="realList" type="si:realListType"/> + <xs:element name="realListXMLList" type="si:realListXMLListType"/> <!-- or list of complex --> <xs:element name="complexList" type="si:complexListType"/> + <xs:element name="complexListXMLList" type="si:complexListXMLListType"/> <!-- or list of lists --> <xs:element name="list" type="si:listType"/> </xs:choice> @@ -727,6 +977,48 @@ </xs:complexType> + <xs:element name="hybrid" type="si:hybridType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + The hybrid elements allows to add quantities to the + machine readable D-SI format, with other units, than those allowed + to be used with the SI by means of the BIPM SI brochure. + </xs:documentation> + <xs:documentation xml:lang="en"> + <![CDATA[ + The hybrid element can contain the following information + + 1. A set of real quantities + - all real elements provide a quantity value for one and the same measured quantity + - each real element provides this quantity with a different unit + - at least one real element provides the quantity with a machine readable SI unit + - the other real quantities can use any SI or non-SI unit + + 2. A set of complex quantities + - all complex elements provide a quantity value for one and the same measured quantity + - each complex element provides this quantity with a different unit(s) + - at least one complex element provides the quantity with a machine readable SI unit(s) + - the other complex quantities can use any SI or non-SI unit + + 3. A set of list elements + - all list elements must provide the same quantity information and hence, must have + an identical structure. + - the lists do only differ by using different units for each of the quantities + - at least one list provides all quantities only with machine readable SI units + - the other lists can use any other units for the quantities + - Applicable list types are si:list, si:realList, si:complexList and si:realListXMLList. + + 4. A set of constant quantities + - all constant elements provide a quantity value for one and the same quantity + - each constant element provides this quantity with a different unit + - at least one constant element provides the quantity with a machine readable SI unit + - the other constant quantities can use any SI or non-SI unit + ]]> + </xs:documentation> + </xs:annotation> + </xs:element> + + <xs:complexType name="hybridType"> <xs:sequence> <!-- mandatory adapter for at least one SI quantity and additional (non-) SI quantities --> @@ -737,179 +1029,165 @@ <xs:element name="realList" type="si:realListType" minOccurs="1" maxOccurs="unbounded"/> <xs:element name="realListXMLList" type="si:realListXMLListType" minOccurs="1" maxOccurs="unbounded"/> <xs:element name="complexList" type="si:complexListType" minOccurs="1" maxOccurs="unbounded"/> + <xs:element name="complexListXMLList" type="si:complexListXMLListType" minOccurs="1" maxOccurs="unbounded"/> <xs:element name="constant" type="si:constantQuantityType" minOccurs="1" maxOccurs="unbounded"/> </xs:choice> </xs:sequence> </xs:complexType> - <xs:complexType name="expandedUncType"> - <xs:sequence> - <xs:element name="uncertainty" type="si:uncertaintyValueType"/> - <xs:element name="coverageFactor" type="si:kValueType"/> - <xs:element name="coverageProbability" type="si:probabilityValueType"/> - <xs:element name="distribution" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="expandedUncXMLListType"> - <xs:sequence> - <xs:element name="uncertaintyXMLList" type="si:uncertaintyValueXMLListType"/> - <xs:element name="coverageFactorXMLList" type="si:kValueXMLListType"/> - <xs:element name="coverageProbabilityXMLList" type="si:probabilityValueXMLListType"/> - <xs:element name="distributionXMLList" type="si:stringXMLListType" minOccurs="0"/> - </xs:sequence> - </xs:complexType> +<!-- ############## D-SI XML INTERNALLY USED SIMPLE TYPE DEFINITIONS #################### --> + <xs:simpleType name="unitType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + BIPM SI brochure unit (9th edition). + Based on xs:string. + </xs:documentation> + </xs:annotation> + <xs:restriction base="xs:string"> + </xs:restriction> + </xs:simpleType> - <xs:complexType name="coverageIntervalType"> - <xs:sequence> - <xs:element name="standardUnc" type="si:uncertaintyValueType"/> - <xs:element name="intervalMin" type="si:decimalType"/> - <xs:element name="intervalMax" type="si:decimalType"/> - <xs:element name="coverageProbability" type="si:probabilityValueType"/> - <xs:element name="distribution" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> + <xs:simpleType name="unitXMLListType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Type providing listing of units (si:unitType) + with separation by blank spaces. + </xs:documentation> + </xs:annotation> + <xs:list itemType="si:unitType" /> + </xs:simpleType> - <xs:complexType name="coverageIntervalXMLListType"> - <xs:sequence> - <xs:element name="standardUncXMLList" type="si:uncertaintyValueXMLListType"/> - <xs:element name="intervalMinXMLList" type="si:decimalXMLListType"/> - <xs:element name="intervalMaxXMLList" type="si:decimalXMLListType"/> - <xs:element name="coverageProbabilityXMLList" type="si:probabilityValueXMLListType"/> - <xs:element name="distributionXMLList" type="si:stringXMLListType" minOccurs="0"/> - </xs:sequence> - </xs:complexType> + <xs:simpleType name="unitPhaseType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Unit of angular quantity in SI. + Based on xs:string. + </xs:documentation> + </xs:annotation> + <xs:restriction base="xs:string"> + </xs:restriction> + </xs:simpleType> - <xs:complexType name="covarianceMatrixType"> - <xs:sequence> - <xs:element name="column" minOccurs="1" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation xml:lang="en"> - Definition of a column in the covariance matrix. - </xs:documentation> - <xs:documentation xml:lang="en"> - <![CDATA[ - The column has n covariance elements, where - n is the amount of columns in the covariance matrix. - - The covariance elements are ordered as in the covariance matrix, started - at the element in the first row of the matrix and going to the - last row of the matrix. - ]]> - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:sequence> - <xs:element name="covariance" minOccurs="1" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation xml:lang="en"> - Each covariance component is defined by - - element value (decimal value type) - - element unit (string - SI format) - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:sequence> - <xs:element name="value" type="si:decimalType"/> - <xs:element name="unit" type="si:unitType"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> + <xs:simpleType name="unitPhaseXMLListType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Type providing listing of phase angle units (si:unitPhase Type) + with separation by blank spaces. + </xs:documentation> + </xs:annotation> + <xs:list itemType="si:unitPhaseType" /> + </xs:simpleType> - <xs:complexType name="ellipsoidalRegionType"> - <xs:sequence> - <!-- covariance matrix data --> - <xs:element name="covarianceMatrix" type="si:covarianceMatrixType"/> - <!-- coverage properties of region --> - <xs:element name="coverageFactor" type="si:kValueType"/> - <xs:element name="coverageProbability" type="si:probabilityValueType"/> - <!-- optional information about distribution --> - <xs:element name="distribution" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> + <xs:simpleType name="decimalType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Scientific decimal format for numerical values. + Based on type xs:double. + </xs:documentation> + </xs:annotation> + <xs:restriction base="xs:double"> + <xs:pattern value="[-+]?((\d*\.\d+)|(\d+\.\d*)|(\d+\.?))([Ee][-+]?\d+)?|NaN"/> + </xs:restriction> + </xs:simpleType> - <xs:complexType name="rectangularRegionType"> - <xs:sequence> - <!-- covariance matrix data --> - <xs:element name="covarianceMatrix" type="si:covarianceMatrixType"/> - <!-- coverage properties of region --> - <xs:element name="coverageFactor" type="si:kValueType"/> - <xs:element name="coverageProbability" type="si:probabilityValueType"/> - <!-- optional information about distribution --> - <xs:element name="distribution" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> + <xs:simpleType name="decimalXMLListType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Type providing listing of values (si:decimalType) + with separation by blank spaces. + </xs:documentation> + </xs:annotation> + <xs:list itemType="si:decimalType" /> + </xs:simpleType> - <xs:complexType name="listUnivariateUncType"> - <xs:choice> - <xs:annotation> - <xs:documentation xml:lang="en"> - univariate measurement uncertainty - </xs:documentation> - </xs:annotation> - <xs:element name="expandedUnc" type="si:expandedUncType"/> - <xs:element name="coverageInterval" type="si:coverageIntervalType"/> - </xs:choice> - </xs:complexType> - <xs:complexType name="listBivariateUncType"> - <xs:choice minOccurs="0"> - <xs:annotation> - <xs:documentation xml:lang="en"> - bivariate measurement uncertainty - </xs:documentation> - </xs:annotation> - <xs:element name="ellipsoidalRegion" type="si:ellipsoidalRegionType"/> - <xs:element name="rectangularRegion" type="si:rectangularRegionType"/> - </xs:choice> - </xs:complexType> + <xs:simpleType name="valueStandardMUType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Scientific decimal format for numerical values of standard + measurement uncertainty that must be positive + (greater than zero or equal to zero). + Based on type xs:double. + </xs:documentation> + </xs:annotation> + <xs:restriction base="xs:double"> + <xs:pattern value="\+?((\d*\.\d+)|(\d+\.\d*)|(\d+\.?))([Ee][-+]?\d+)?|NaN"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="valueStandardMUXMLListType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Type providing listing of values (si:valueStandardMUType) + with separation by blank spaces. + </xs:documentation> + </xs:annotation> + <xs:list itemType="si:valueStandardMUType" /> + </xs:simpleType> + <xs:simpleType name="valueExpandedMUType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Scientific decimal format for numerical values of expanded + measurement uncertainty that must be positive + (greater than zero or equal to zero). + Based on type xs:double. + </xs:documentation> + </xs:annotation> + <xs:restriction base="xs:double"> + <xs:pattern value="\+?((\d*\.\d+)|(\d+\.\d*)|(\d+\.?))([Ee][-+]?\d+)?|NaN"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="valueExpandedMUXMLListType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Type providing listing of values (si:valueStandardMUType) + with separation by blank spaces. + </xs:documentation> + </xs:annotation> + <xs:list itemType="si:valueExpandedMUType" /> + </xs:simpleType> -<!-- ############## D-SI XML INTERNALLY USED SIMPLE TYPE DEFINITIONS #################### --> - <xs:simpleType name="unitType"> + <xs:simpleType name="uncertaintyValueType"> <xs:annotation> <xs:documentation xml:lang="en"> - BIPM SI brochure unit (9th edition). - Based on xs:string. + [deprecated element] use + si:valueExpandedMUType + or si:valueStandardMUType </xs:documentation> </xs:annotation> - <xs:restriction base="xs:string"> + <xs:restriction base="xs:double"> + <xs:pattern value="\+?((\d*\.\d+)|(\d+\.\d*)|(\d+\.?))([Ee][-+]?\d+)?|NaN"/> </xs:restriction> </xs:simpleType> - <xs:simpleType name="unitPhaseType"> + <xs:simpleType name="uncertaintyValueXMLListType"> <xs:annotation> <xs:documentation xml:lang="en"> - Unit of angular quantity in SI. - Based on xs:string. + [deprecated element] use + si:valueExpandedMUXMLListType + or si:valueStandardMUXMLListType </xs:documentation> </xs:annotation> - <xs:restriction base="xs:string"> - </xs:restriction> + <xs:list itemType="si:uncertaintyValueType"/> </xs:simpleType> - - <xs:simpleType name="decimalType"> + + <xs:simpleType name="intervalMinType"> <xs:annotation> <xs:documentation xml:lang="en"> Scientific decimal format for numerical values. @@ -917,25 +1195,46 @@ </xs:documentation> </xs:annotation> <xs:restriction base="xs:double"> - <xs:pattern value="[-+]?((\d*\.\d+)|(\d+\.\d*)|(\d+\.?))([Ee][-+]?\d+)?"/> + <xs:pattern value="[-+]?((\d*\.\d+)|(\d+\.\d*)|(\d+\.?))([Ee][-+]?\d+)?|NaN"/> </xs:restriction> </xs:simpleType> - - <xs:simpleType name="uncertaintyValueType"> + + <xs:simpleType name="intervalMinXMLListType"> <xs:annotation> <xs:documentation xml:lang="en"> - Scientific decimal format for numerical values of uncertainties - that must be positive (greater than zero or equal to zero). - Based on type xs:double. + Type providing listing of values (si:intervalMinType) + with separation by blank spaces. </xs:documentation> </xs:annotation> + <xs:list itemType="si:intervalMinType" /> + </xs:simpleType> + + <xs:simpleType name="intervalMaxType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Scientific decimal format for numerical values. + Based on type xs:double. + </xs:documentation> + </xs:annotation> <xs:restriction base="xs:double"> - <xs:pattern value="\+?((\d*\.\d+)|(\d+\.\d*)|(\d+\.?))([Ee][-+]?\d+)?"/> + <xs:pattern value="[-+]?((\d*\.\d+)|(\d+\.\d*)|(\d+\.?))([Ee][-+]?\d+)?|NaN"/> </xs:restriction> </xs:simpleType> - + + + <xs:simpleType name="intervalMaxXMLListType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Type providing listing of values (si:intervalMaxType) + with separation by blank spaces. + </xs:documentation> + </xs:annotation> + <xs:list itemType="si:intervalMaxType" /> + </xs:simpleType> + + <xs:simpleType name="kValueType"> <xs:annotation> <xs:documentation xml:lang="en"> @@ -949,7 +1248,18 @@ </xs:restriction> </xs:simpleType> - + + <xs:simpleType name="kValueXMLListType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Type providing listing of coverage factor values (si:kValueType) + with separation by blank spaces. + </xs:documentation> + </xs:annotation> + <xs:list itemType="si:kValueType" /> + </xs:simpleType> + + <xs:simpleType name="probabilityValueType"> <xs:annotation> <xs:documentation xml:lang="en"> @@ -965,85 +1275,200 @@ </xs:simpleType> - <!-- ############## D-SI XML-Lists for D-SI SimpleTypes #################### --> - <xs:simpleType name="unitXMLListType"> + <xs:simpleType name="probabilityValueXMLListType"> <xs:annotation> <xs:documentation xml:lang="en"> - Type providing listing of units (si:unitType) + Type providing listing of coverage probability values (si:probabilityValueType) with separation by blank spaces. </xs:documentation> </xs:annotation> - <xs:list itemType="si:unitType" /> + <xs:list itemType="si:probabilityValueType" /> </xs:simpleType> - <xs:simpleType name="unitPhaseXMLListType"> + + <xs:simpleType name="significantDigitsType"> <xs:annotation> <xs:documentation xml:lang="en"> - Type providing listing of phase angle units (si:unitPhase Type) + Type providing number of significant digitis with separation by blank spaces. </xs:documentation> </xs:annotation> - <xs:list itemType="si:unitPhaseType" /> + <xs:restriction base="xs:nonNegativeInteger"/> </xs:simpleType> - <xs:simpleType name="decimalXMLListType"> + + <xs:simpleType name="significantDigitsXMLListType"> <xs:annotation> <xs:documentation xml:lang="en"> - Type providing listing of values (si:decimalType) + Type providing number of significant digitis with separation by blank spaces. </xs:documentation> </xs:annotation> - <xs:list itemType="si:decimalType" /> + <xs:list itemType="xs:nonNegativeInteger" /> </xs:simpleType> - <xs:simpleType name="uncertaintyValueXMLListType"> + + <xs:simpleType name="dateTimeXMLListType"> <xs:annotation> <xs:documentation xml:lang="en"> - Type providing listing of uncertainty values (si:uncertaintyValueType) + Type providing listing of time values (xs:dateTime) with separation by blank spaces. </xs:documentation> </xs:annotation> - <xs:list itemType="si:uncertaintyValueType"/> + <xs:list itemType="xs:dateTime" /> </xs:simpleType> - <xs:simpleType name="kValueXMLListType"> + + <xs:simpleType name="distributionType"> <xs:annotation> <xs:documentation xml:lang="en"> - Type providing listing of coverage factor values (si:kValueType) - with separation by blank spaces. + String providing a distribution (statistical distribution of measurement values). </xs:documentation> </xs:annotation> - <xs:list itemType="si:kValueType" /> + <xs:restriction base="xs:string"/> </xs:simpleType> - <xs:simpleType name="probabilityValueXMLListType"> + + <xs:simpleType name="distributionXMLListType"> <xs:annotation> <xs:documentation xml:lang="en"> - Type providing listing of coverage probability values (si:probabilityValueType) + Type providing listing of distributions (si:distributionType) with separation by blank spaces. </xs:documentation> </xs:annotation> - <xs:list itemType="si:probabilityValueType" /> + <xs:list itemType="si:distributionType" /> </xs:simpleType> - <xs:simpleType name="dateTimeXMLListType"> + + <xs:simpleType name="stringXMLListType"> <xs:annotation> <xs:documentation xml:lang="en"> - Type providing listing of time values (xs:dateTime) + Type providing listing of strings (xs:string) with separation by blank spaces. </xs:documentation> </xs:annotation> - <xs:list itemType="xs:dateTime" /> + <xs:list itemType="xs:string" /> </xs:simpleType> - <xs:simpleType name="stringXMLListType"> + + + +<!-- ############## D-SI SUPPLEMENTAL XML ELEMENT DEFINITIONS #################### --> + + + <xs:element name="expandedUnc" type="si:expandedUncType"> <xs:annotation> <xs:documentation xml:lang="en"> - Type providing listing of strings (xs:string) - with separation by blank spaces. + [deprectated element] Definition of the structure, that gives the necessary components for stating + an expanded measurement uncertainty. This element must always be used in the + context of a real quantity, which is an application within si:real and/or + si:globalUnivariateUnc. + </xs:documentation> + <xs:documentation xml:lang="en"> + <![CDATA[ + The element has the following components [(m)-mandatory, (o)-optional]: + + (m) - element valueExpandedMU (decimal value >= 0, THE EXPANDED UNCERTAINTY VALUE!) + (m) - element coverageFactor (decimal value >= 1) + (m) - element coverageProbability (decimal value in [0,1]) + (o) - element distribution (string) + + The unit of component uncertainty is the unit used in the context of + si:real and/or si:globalUnivariateUnc. + ]]> </xs:documentation> </xs:annotation> - <xs:list itemType="xs:string" /> - </xs:simpleType> + </xs:element> + + + <xs:element name="coverageInterval" type="si:coverageIntervalType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + [deprectated element] Definition of the structure, that gives the necessary components for stating + a probabilistic-symmetric coverage interval for a real uncertainty. This element + must always be used in the context of a real quantity, which is an application + within si:real and/or si:globalUnivariateUnc. + </xs:documentation> + <xs:documentation xml:lang="en"> + <![CDATA[ + The element has the following components [(m)-mandatory, (o)-optional]: + + (m) - element valueStandardMU (decimal value >= 0) + (m) - element intervalMin (decimal value type) + (m) - element intervalMax (decimal value type) + (m) - element coverageProbability (decimal value in [0,1]) + (o) - element distribution (string) + + The unit of components stdUncertainty, intervalMin and intervalMax is the unit + used in the context of si:real and/or si:globalUnivaraiteUnc. + ]]> + </xs:documentation> + </xs:annotation> + </xs:element> + + + <!-- D-SI XML ELEMENT DEFINITIONS FOR COVARIANCE MATRIX ELEMENT --> + <xs:element name="covarianceMatrix" type="si:covarianceMatrixType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + Definition of a covariance matrix element that is used for + multidimensional uncertainty statements in the D-SI format. + </xs:documentation> + <xs:documentation xml:lang="en"> + <![CDATA[ + A covariance matrix has n column elements. + The dimension of the covariance matrix is the amount of columns. + Each column contains the covariance values of one column of the + covariance matrix. + The order of the columns is from left to right column in the + covariance matrix. + ]]> + </xs:documentation> + </xs:annotation> + </xs:element> + + + <xs:element name="ellipsoidalRegion" type="si:ellipsoidalRegionType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + [deprectated element] Definition of the structure, that provides a hyper-ellipsoidal coverage + region for stating the uncertainty of multivariate quantities. It is + used in the context of uncertainty for complex quantities and + lists of real or complex quantities. + </xs:documentation> + <xs:documentation xml:lang="en"> + <![CDATA[ + The element has the following components [(m)-mandatory, (o)-optional]: + + (m) - element covarianceMatrix (sub structure covarianceMatrix) + (m) - element coverageFactor (decimal value >= 1) + (m) - element coverageProbability (decimal value in [0,1]) + (o) - element distribution (string) + ]]> + </xs:documentation> + </xs:annotation> + </xs:element> + + + <xs:element name="rectangularRegion" type="si:rectangularRegionType"> + <xs:annotation> + <xs:documentation xml:lang="en"> + [deprectated element] Definition of the structure that provides a hyper-rectangular coverage + region for stating the uncertainty of multivariate quantities. It is + used in the context of uncertainty for complex quantities and + lists of real or complex quantities. + </xs:documentation> + <xs:documentation xml:lang="en"> + <![CDATA[ + The element has the following components [(m)-mandatory, (o)-optional]: + + (m) - element covarianceMatrix (sub structure covarianceMatrix) + (m) - element coverageFactor (decimal value >= 1) + (m) - element coverageProbability (decimal value in [0,1]) + (o) - element distribution (string) + ]]> + </xs:documentation> + </xs:annotation> + </xs:element> </xs:schema> diff --git a/examples/BRONZE/2020-03-20-UM-BRONZE-examples.xml b/examples/BRONZE/2020-03-20-UM-BRONZE-examples.xml index a657ef9144f7e6978973089fbff63ba17525537f..bea33933e7635b5d8ba251481d6844c6d4ae4f6b 100644 --- a/examples/BRONZE/2020-03-20-UM-BRONZE-examples.xml +++ b/examples/BRONZE/2020-03-20-UM-BRONZE-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation=" https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. - Authors: Bojan Acko, Rok Klobucar + Authors: Bojan Acko, Rok Klobucar DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/BRONZE/2021-11-22-BRONZE-examples-xmllists.xml b/examples/BRONZE/2021-11-22-BRONZE-examples-xmllists.xml index 697c90201cc0cc4c7aa4d76ba41ebf13d96dab2c..548e2c81f2dba0d91a4b3c13e642111f96567536 100644 --- a/examples/BRONZE/2021-11-22-BRONZE-examples-xmllists.xml +++ b/examples/BRONZE/2021-11-22-BRONZE-examples-xmllists.xml @@ -4,7 +4,7 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. @@ -12,7 +12,7 @@ AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si D-SI XSD VERSION: 2.2.0 - RELEASE DATA: 2022-01-21 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/BRONZE/2022-05-23-BRONZE-examples.xml b/examples/BRONZE/2022-05-23-BRONZE-examples.xml index bdacc7af005be5f8c726eb7b06af79621cb249ff..da818ddb65faf8f92a3cc0e4a965d3eca36c783a 100644 --- a/examples/BRONZE/2022-05-23-BRONZE-examples.xml +++ b/examples/BRONZE/2022-05-23-BRONZE-examples.xml @@ -4,7 +4,7 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd" > + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd" > <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. @@ -12,7 +12,7 @@ AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si D-SI XSD VERSION: 2.2.0 - RELEASE DATA: 2022-01-21 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/BRONZE/PTB-BRONZE-examples-2.xml b/examples/BRONZE/PTB-BRONZE-examples-2.xml index d86d211db97bf3bccf0e9ca920cdad6723b568bf..34cd4ea9a1f10079238383aa46deed22466a063a 100644 --- a/examples/BRONZE/PTB-BRONZE-examples-2.xml +++ b/examples/BRONZE/PTB-BRONZE-examples-2.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/BRONZE/PTB-BRONZE-examples.xml b/examples/BRONZE/PTB-BRONZE-examples.xml index 1e858bfb808ffb6479113d370223f9927fc1f99e..a6b159ac67128538df768876c78beaf0fee63d76 100644 --- a/examples/BRONZE/PTB-BRONZE-examples.xml +++ b/examples/BRONZE/PTB-BRONZE-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/GOLD/2020-03-20-UM-GOLD-examples.xml b/examples/GOLD/2020-03-20-UM-GOLD-examples.xml index 1c79fa395eb72d3fa427838b355498f79c22341e..39b343e4dfa01e80c1bba7d6049d6a5d234ed75c 100644 --- a/examples/GOLD/2020-03-20-UM-GOLD-examples.xml +++ b/examples/GOLD/2020-03-20-UM-GOLD-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. - Authors: Bojan Acko, Rok Klobucar + Authors: Bojan Acko, Rok Klobucar DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/GOLD/2021-10-26-GOLD-examples-xmllists.xml b/examples/GOLD/2021-10-26-GOLD-examples-xmllists.xml index 9c72b65e0e18c2987136a3b0599fb6c1937c910e..bd6b9938a3efd625022f716be4c3c7a9324e280b 100644 --- a/examples/GOLD/2021-10-26-GOLD-examples-xmllists.xml +++ b/examples/GOLD/2021-10-26-GOLD-examples-xmllists.xml @@ -4,7 +4,7 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. @@ -12,7 +12,7 @@ AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si D-SI XSD VERSION: 2.2.0 - RELEASE DATA: 2022-01-21 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/GOLD/2022-05-23-GOLD-examples.xml b/examples/GOLD/2022-05-23-GOLD-examples.xml index 92bc971661e36a09024d0e341dfe0d9cac2af73e..60e13e63fb0610e383a9a35ec2738c7b06a044db 100644 --- a/examples/GOLD/2022-05-23-GOLD-examples.xml +++ b/examples/GOLD/2022-05-23-GOLD-examples.xml @@ -4,7 +4,7 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. @@ -12,7 +12,7 @@ AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si D-SI XSD VERSION: 2.2.0 - RELEASE DATA: 2022-01-21 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/GOLD/PTB-GOLD-examples-2.xml b/examples/GOLD/PTB-GOLD-examples-2.xml index 4c415e82570911203cd75e4595587eb8510a1500..65dab8844bdc2848a631aa5c196c1051b1a7d2d7 100644 --- a/examples/GOLD/PTB-GOLD-examples-2.xml +++ b/examples/GOLD/PTB-GOLD-examples-2.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/GOLD/PTB-GOLD-examples.xml b/examples/GOLD/PTB-GOLD-examples.xml index 7ec1d6637b74b03df9be65488f3cadc89f0becd9..a1f3ea1f0b44d23c3f603567c09e512bfb0f910b 100644 --- a/examples/GOLD/PTB-GOLD-examples.xml +++ b/examples/GOLD/PTB-GOLD-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/GOLD/gold-test.xml b/examples/GOLD/gold-test.xml index d86a52ad53817d0efebdcfa5617c70643ca647cd..826516f63fc4b666648f82e9fc801c9287f6581a 100644 --- a/examples/GOLD/gold-test.xml +++ b/examples/GOLD/gold-test.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Ostfalia HAW, all rights reserved. Authors: Bernd Müller, Lukas Heindorf DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml b/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml index 2bff6da2d3493a70b115a5bbb758afd3ed4ff1dc..f9bff5268989f186fe226eada750c6df983d73d4 100644 --- a/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml +++ b/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml @@ -3,7 +3,7 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. diff --git a/examples/IMPROVABLE/2021-11-23-IMPROVABLE-examples-xmllists.xml b/examples/IMPROVABLE/2021-11-23-IMPROVABLE-examples-xmllists.xml index 37ad5d4ab8edabdf8f9172ff3d31e54d9654904b..04731d3a159ffa3227fb2c2c6de0abf06d016e04 100644 --- a/examples/IMPROVABLE/2021-11-23-IMPROVABLE-examples-xmllists.xml +++ b/examples/IMPROVABLE/2021-11-23-IMPROVABLE-examples-xmllists.xml @@ -4,15 +4,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.2.0-RC1 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/IMPROVABLE/2022-05-23-IMPROVABLE-examples.xml b/examples/IMPROVABLE/2022-05-23-IMPROVABLE-examples.xml index 87e139a7622d67bde79b63b9319da5184abd03c7..3e014e7982d6496a4ac544421f67cee9c185f168 100644 --- a/examples/IMPROVABLE/2022-05-23-IMPROVABLE-examples.xml +++ b/examples/IMPROVABLE/2022-05-23-IMPROVABLE-examples.xml @@ -4,15 +4,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.2.0-RC1 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml b/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml index e96daac40a25d5f99d3fc173998cd1213e687309..b8044fd6daf11485fcbd1f0fb5c40e4603fcccb9 100644 --- a/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml +++ b/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml b/examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml index 0d26015ba97394d04fdda9c8f6033f33fd668613..e1789151f741d8be7bc95d3e7f18254485cdb93f 100644 --- a/examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml +++ b/examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/IMPROVABLE/improvable-test.xml b/examples/IMPROVABLE/improvable-test.xml index 9a1d0b9bd2eecf2268be35cfd955aff9a1cb4421..f33c3fa4bc349191176379350d15e26d552d3516 100644 --- a/examples/IMPROVABLE/improvable-test.xml +++ b/examples/IMPROVABLE/improvable-test.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Ostfalia HAW, all rights reserved. Authors: Bernd Müller, Lukas Heindorf DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/NOT PASSED/UM58-D-SI-example.xml b/examples/NOT PASSED/UM58-D-SI-example.xml index dff4bd3d5ab21dc8a4a747eccebcf4f563523a72..00c451f95dcf46b9c437d1600f1fa9a85c966af1 100644 --- a/examples/NOT PASSED/UM58-D-SI-example.xml +++ b/examples/NOT PASSED/UM58-D-SI-example.xml @@ -1,10 +1,10 @@ <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. - Authors: Bojan Acko, Rok Klobucar + Authors: Bojan Acko, Rok Klobucar DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/NOT PASSED/UM59-D-SI-example.xml b/examples/NOT PASSED/UM59-D-SI-example.xml index 2467e3eabfaa5d5f90abb25b527f4ab59474e790..a86ea64f0bb32aa4b0c4a9f02af0ffe5d6d44b6b 100644 --- a/examples/NOT PASSED/UM59-D-SI-example.xml +++ b/examples/NOT PASSED/UM59-D-SI-example.xml @@ -1,10 +1,10 @@ <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. - Authors: Bojan Acko, Rok Klobucar + Authors: Bojan Acko, Rok Klobucar DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/NOT PASSED/UM60-D-SI-example.xml b/examples/NOT PASSED/UM60-D-SI-example.xml index d46cdfd41b04aa6122bc6d6fe74614e3e47fb433..d5b26f13244ca89daa81928fb49c9e5aa9f03c14 100644 --- a/examples/NOT PASSED/UM60-D-SI-example.xml +++ b/examples/NOT PASSED/UM60-D-SI-example.xml @@ -1,10 +1,10 @@ <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. - Authors: Bojan Acko, Rok Klobucar + Authors: Bojan Acko, Rok Klobucar DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/PLATINUM/2020-03-20-UM-PLATINUM-examples.xml b/examples/PLATINUM/2020-03-20-UM-PLATINUM-examples.xml index 67b58175d5fb21980312b83123954413be0b40c0..82e66f290d8844263cb8bc939aae564fb134b11c 100644 --- a/examples/PLATINUM/2020-03-20-UM-PLATINUM-examples.xml +++ b/examples/PLATINUM/2020-03-20-UM-PLATINUM-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. - Authors: Bojan Acko, Rok Klobucar + Authors: Bojan Acko, Rok Klobucar DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml b/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml index e61f351db58f2bcb3d821b2b4f6a91fa911a1c4b..b654406417f35d577ab3b1c70e3d9f3364684184 100644 --- a/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml +++ b/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml @@ -4,7 +4,7 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. @@ -12,7 +12,7 @@ AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si D-SI XSD VERSION: 2.2.0 - RELEASE DATA: 2022-01-21 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/PLATINUM/2022-05-23-PLATINUM-examples.xml b/examples/PLATINUM/2022-05-23-PLATINUM-examples.xml index 34f0843395131a543b9634bf03a96ab4b72f5f61..e437904c2282b22cd11abb24eccd78ba3e335ad5 100644 --- a/examples/PLATINUM/2022-05-23-PLATINUM-examples.xml +++ b/examples/PLATINUM/2022-05-23-PLATINUM-examples.xml @@ -4,7 +4,7 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. @@ -12,7 +12,7 @@ AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si D-SI XSD VERSION: 2.2.0 - RELEASE DATA: 2022-01-21 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml b/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml new file mode 100644 index 0000000000000000000000000000000000000000..b1ff258d41b0c68ef386ef25c03c542127f8e4e0 --- /dev/null +++ b/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml @@ -0,0 +1,321 @@ +<siTest:testDSIXML + xmlns:siTest="https://ptb.de/si/examples" + xmlns:si="https://ptb.de/si" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> + + <!-- + https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd + + Copyright (c) 2018-2023 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. + + AUTHORS: Wafa El Jaoua, Daniel Hutzschenreuter & autors of predecessor versions + DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD + DOI: 10.5281/zenodo.3366901 + + This XML file is free data: you can redistribute it and/or modify + it under the terms of the Creative Commons Attribution 4.0 International License + as published by the Creative Commons Corporation. + + This XML is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + You should have received a copy of the Commons Attribution 4.0 International License + along with this XML. If not, see https://creativecommons.org/licenses/by/4.0/. + --> + + <siTest:metaData> + <siTest:testDescription>XML examples including quantity type for SmartCom D-SI data with quality class PLATINUM (D-SI XSD version 2.2.0)</siTest:testDescription> + </siTest:metaData> + + <siTest:testData id="PTB800"> + <si:real> + <si:quantityType>length</si:quantityType> + <si:value>NaN</si:value> + <si:unit>\metre</si:unit> + <si:expandedUnc> + <si:uncertainty>NaN</si:uncertainty> + <si:coverageFactor>1.96</si:coverageFactor> + <si:coverageProbability>0.95</si:coverageProbability> + </si:expandedUnc> + </si:real> + </siTest:testData> + + <siTest:testData id="PTB801"> + <si:realListXMLList> + <si:quantityTypeXMLList>length</si:quantityTypeXMLList> + <si:valueXMLList>NaN 3.45 0.78 NaN 9.87</si:valueXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + <si:expandedUncXMLList> + <si:uncertaintyXMLList>NaN</si:uncertaintyXMLList> + <si:coverageFactorXMLList>1.96</si:coverageFactorXMLList> + <si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList> + </si:expandedUncXMLList> + </si:realListXMLList> + </siTest:testData> + + <siTest:testData id="PTB802"> + <si:real> + <si:value>1.023</si:value> + <si:unit>\metre</si:unit> + <si:significantDigits>4</si:significantDigits> + </si:real> + </siTest:testData> + + <siTest:testData id="PTB803"> + <si:realListXMLList> + <si:quantityTypeXMLList>length</si:quantityTypeXMLList> + <si:valueXMLList>1.23 3.454 0.78 9.87</si:valueXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + <si:significantDigitsXMLList>3 4 3 1</si:significantDigitsXMLList> + </si:realListXMLList> + </siTest:testData> + + <siTest:testData id="PTB804"> + <si:real> + <si:value>1.00</si:value> + <si:unit>\metre</si:unit> + <si:measurementUncertaintyStandard> + <si:valueStandardMU>0.05</si:valueStandardMU> + <si:distribution>normal</si:distribution> + </si:measurementUncertaintyStandard> + </si:real> + </siTest:testData> + + <siTest:testData id="PTB805"> + <si:real> + + <si:value>1.00</si:value> + <si:unit>\metre</si:unit> + <si:measurementUncertaintyExpanded> + <si:valueExpandedMU>0.10</si:valueExpandedMU> + <si:coverageFactor>1.96</si:coverageFactor> + <si:coverageProbability>0.95</si:coverageProbability> + <si:distribution>normal</si:distribution> + </si:measurementUncertaintyExpanded> + </si:real> + </siTest:testData> + + <siTest:testData id="PTB806"> + <si:real> + <si:value>1.00</si:value> + <si:unit>\metre</si:unit> + <si:measurementUncertaintyInterval> + <si:valueStandardMU>0.05</si:valueStandardMU> + <si:intervalMin>0.90</si:intervalMin> + <si:intervalMax>1.20</si:intervalMax> + <si:coverageProbability>0.95</si:coverageProbability> + <si:distribution>normal</si:distribution> + </si:measurementUncertaintyInterval> + </si:real> + </siTest:testData> + + <siTest:testData id="PTB807"> + <si:constant> + <si:value>1.00</si:value> + <si:unit>\metre</si:unit> + <si:valueStandardMU>0.05</si:valueStandardMU> + <si:distribution>normal</si:distribution> + </si:constant> + </siTest:testData> + + <siTest:testData id="PTB808"> + <si:realListXMLList> + <si:valueXMLList>1.0 2.0 3.0 4.0</si:valueXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + <si:measurementUncertaintyStandardXMLList> + <si:valueStandardMUXMLList>0.1 0.1 0.1 0.1</si:valueStandardMUXMLList> + <si:distributionXMLList>nomral rectangular triangle student</si:distributionXMLList> + </si:measurementUncertaintyStandardXMLList> + </si:realListXMLList> + </siTest:testData> + + <siTest:testData id="PTB809"> + <si:realListXMLList> + <si:valueXMLList>1.0 2.0 3.0 4.0</si:valueXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + <si:measurementUncertaintyExpandedXMLList> + <si:valueExpandedMUXMLList>0.1 0.1 0.1 0.1</si:valueExpandedMUXMLList> + <si:coverageFactorXMLList>1.96 2.00 3.0 1.0</si:coverageFactorXMLList> + <si:coverageProbabilityXMLList>0.95 0.06 0.98 1.00</si:coverageProbabilityXMLList> + <si:distributionXMLList>normal rectangular triangle student</si:distributionXMLList> + </si:measurementUncertaintyExpandedXMLList> + </si:realListXMLList> + </siTest:testData> + + <siTest:testData id="PTB810"> + <si:realListXMLList> + <si:valueXMLList>1.0 2.0 3.0 4.0</si:valueXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + <si:measurementUncertaintyIntervalXMLList> + <si:valueStandardMUXMLList>0.1</si:valueStandardMUXMLList> + <si:intervalMinXMLList>0.0</si:intervalMinXMLList> + <si:intervalMaxXMLList>2.0 3.0 4.0 5.0</si:intervalMaxXMLList> + <si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList> + <si:distributionXMLList>normal</si:distributionXMLList> + </si:measurementUncertaintyIntervalXMLList> + </si:realListXMLList> + </siTest:testData> + + <siTest:testData id="PTB811"> + <si:complexListXMLList> + <si:valueRealXMLList>1.0 2.0</si:valueRealXMLList> + <si:valueImagXMLList>1.0 2.0</si:valueImagXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + <si:mUncBivarEllipsoidalXMLList> + <si:covarianceMatrixXMLList> + <si:columnXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.5 0.5</si:valueXMLList> + <si:unitXMLList>\metre\metre</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.0 0.0</si:valueXMLList> + <si:unitXMLList>\metre\metre</si:unitXMLList> + </si:covarianceXMLList> + </si:columnXMLList> + <si:columnXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.5 0.5</si:valueXMLList> + <si:unitXMLList>\metre\metre</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.0 0.0</si:valueXMLList> + <si:unitXMLList>\metre\metre</si:unitXMLList> + </si:covarianceXMLList> + </si:columnXMLList> + </si:covarianceMatrixXMLList> + <si:coverageFactorXMLList>1.96 2.00</si:coverageFactorXMLList> + <si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList> + <si:distributionXMLList>normal real</si:distributionXMLList> + </si:mUncBivarEllipsoidalXMLList> + </si:complexListXMLList> + </siTest:testData> + + <siTest:testData id="PTB812"> + <si:complexListXMLList> + <si:valueMagnitudeXMLList>1.0 2.0</si:valueMagnitudeXMLList> + <si:valuePhaseXMLList>1.0 2.0</si:valuePhaseXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + <si:unitPhaseXMLList>\one</si:unitPhaseXMLList> + <si:mUncMultivarEllipsoidalXMLList> + <si:covarianceMatrixXMLList> + <si:columnXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.5 0.5</si:valueXMLList> + <si:unitXMLList>\metre\metre</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.0 0.0</si:valueXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.5 0.5</si:valueXMLList> + <si:unitXMLList>\metre\metre</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.0 0.0</si:valueXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + </si:covarianceXMLList> + </si:columnXMLList> + <si:columnXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.5 0.5</si:valueXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.0 0.0</si:valueXMLList> + <si:unitXMLList>\one</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.5 0.5</si:valueXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.0 0.0</si:valueXMLList> + <si:unitXMLList>\one</si:unitXMLList> + </si:covarianceXMLList> + </si:columnXMLList> + <si:columnXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.5 0.5</si:valueXMLList> + <si:unitXMLList>\metre\metre</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.0 0.0</si:valueXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.5 0.5</si:valueXMLList> + <si:unitXMLList>\metre\metre</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.0 0.0</si:valueXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + </si:covarianceXMLList> + </si:columnXMLList> + <si:columnXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.5 0.5</si:valueXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.0 0.0</si:valueXMLList> + <si:unitXMLList>\one</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.5 0.5</si:valueXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.0 0.0</si:valueXMLList> + <si:unitXMLList>\one</si:unitXMLList> + </si:covarianceXMLList> + </si:columnXMLList> + </si:covarianceMatrixXMLList> + <si:coverageFactorXMLList>1.96 2.00</si:coverageFactorXMLList> + <si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList> + <si:distributionXMLList>normal real</si:distributionXMLList> + </si:mUncMultivarEllipsoidalXMLList> + </si:complexListXMLList> + </siTest:testData> + + + <siTest:testData id="PTB813"> + <si:realListXMLList> + <si:valueXMLList>1.0 2.0</si:valueXMLList> + <si:unitXMLList>\metre</si:unitXMLList> + <si:mUncMultivarRectangularXMLList> + <si:covarianceMatrixXMLList> + <si:columnXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.5 0.5</si:valueXMLList> + <si:unitXMLList>\metre\metre</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.0 0.0</si:valueXMLList> + <si:unitXMLList>\metre\metre</si:unitXMLList> + </si:covarianceXMLList> + </si:columnXMLList> + <si:columnXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.5 0.5</si:valueXMLList> + <si:unitXMLList>\metre\metre</si:unitXMLList> + </si:covarianceXMLList> + <si:covarianceXMLList> + <si:valueXMLList>0.0 0.0</si:valueXMLList> + <si:unitXMLList>\metre\metre</si:unitXMLList> + </si:covarianceXMLList> + </si:columnXMLList> + </si:covarianceMatrixXMLList> + <si:coverageFactorXMLList>1.96</si:coverageFactorXMLList> + <si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList> + <si:distributionXMLList>normal</si:distributionXMLList> + </si:mUncMultivarRectangularXMLList> + </si:realListXMLList> + </siTest:testData> + +</siTest:testDSIXML> \ No newline at end of file diff --git a/examples/PLATINUM/PTB-PLATINUM-examples-2.xml b/examples/PLATINUM/PTB-PLATINUM-examples-2.xml index 2af89b31a8182a5e6403bc801c992fcbdb79ce44..42376beb94f56e1885599913ef5e84365a237937 100644 --- a/examples/PLATINUM/PTB-PLATINUM-examples-2.xml +++ b/examples/PLATINUM/PTB-PLATINUM-examples-2.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/PLATINUM/PTB-PLATINUM-examples.xml b/examples/PLATINUM/PTB-PLATINUM-examples.xml index 1cbd77458304a059ef72789dcff802e9102ec137..0e7354ac79a5793825377569dc654019bc81fad1 100644 --- a/examples/PLATINUM/PTB-PLATINUM-examples.xml +++ b/examples/PLATINUM/PTB-PLATINUM-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 10.5281/zenodo.4709001 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/PLATINUM/platinum-test.xml b/examples/PLATINUM/platinum-test.xml index cc58fc7c7c0031b1353496ec058e70f1a9c59f0c..4531757d7b8e2dacf54973819e0ed047e42a1a4c 100644 --- a/examples/PLATINUM/platinum-test.xml +++ b/examples/PLATINUM/platinum-test.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Ostfalia HAW, all rights reserved. Authors: Bernd Müller, Lukas Heindorf DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/SILVER/2020-03-20-UM-SILVER-examples.xml b/examples/SILVER/2020-03-20-UM-SILVER-examples.xml index a446baec30101ace2099bee9cebab1f97bf5886d..a541c01ad58aaeb7d3717812cfc6cb89ac646900 100644 --- a/examples/SILVER/2020-03-20-UM-SILVER-examples.xml +++ b/examples/SILVER/2020-03-20-UM-SILVER-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 University of Maribour (UM), all rights reserved. Authors: Bojan Acko, Rok Klobucar DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml b/examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml index 2a4e72c5a81da0ab4384f901936195d8835a9652..08c8bbd2f128d0882235dad98bd36151e3c7f87d 100644 --- a/examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml +++ b/examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml @@ -4,15 +4,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.2.0-RC1 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/SILVER/2022-05-23-SILVER-examples.xml b/examples/SILVER/2022-05-23-SILVER-examples.xml index c9571372e1626bb2e4fa20445749a2f59eab24a4..301cdf3f7587aaaf4ecc138ba973d9da39239085 100644 --- a/examples/SILVER/2022-05-23-SILVER-examples.xml +++ b/examples/SILVER/2022-05-23-SILVER-examples.xml @@ -4,15 +4,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.2.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2022 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. AUTHORS: Justin Jagieniak, Benjamin Glogeer DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.2.0-RC1 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/SILVER/PTB-SILVER-examples-2.xml b/examples/SILVER/PTB-SILVER-examples-2.xml index e83fcf3d477d0a5c9530bacd7ed012f12974b74c..bde3a8d2416cad40233eebec976f3e13700cfd62 100644 --- a/examples/SILVER/PTB-SILVER-examples-2.xml +++ b/examples/SILVER/PTB-SILVER-examples-2.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/SILVER/PTB-SILVER-examples.xml b/examples/SILVER/PTB-SILVER-examples.xml index d1b477dd619541382af95c86054e5f6435391830..dfc296bfa8951619f38151d912988f40d235c5d4 100644 --- a/examples/SILVER/PTB-SILVER-examples.xml +++ b/examples/SILVER/PTB-SILVER-examples.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. CONTACT: smartcom@ptb.de DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/SILVER/silver-test.xml b/examples/SILVER/silver-test.xml index 88fcdd78cf34f5f59cd340370cef3428b007e87b..380eea353d964e00057fbc0eff5655fec32adadc 100644 --- a/examples/SILVER/silver-test.xml +++ b/examples/SILVER/silver-test.xml @@ -3,15 +3,15 @@ xmlns:siTest="https://ptb.de/si/examples" xmlns:si="https://ptb.de/si" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.1.0/examples/SI_Format_TestData.xsd"> + xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd"> <!-- Copyright (c) 2019 - 2021 Ostfalia HAW, all rights reserved. Authors: Bernd Müller, Lukas Heindorf DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si - D-SI XSD VERSION: 2.1.0 - RELEASE DATA: 2022-01-21 + D-SI XSD VERSION: 2.2.0 + RELEASE DATA: 2023-MM-DD DOI: 10.5281/zenodo.3366901 This XML file is free data: you can redistribute it and/or modify diff --git a/examples/SI_Format_TestData.xsd b/examples/SI_Format_TestData.xsd index bcb51bb8c13e9a286c55d72b3f1c652da905473e..9fe27bf09161c78cc28ff520210120087e038c1f 100644 --- a/examples/SI_Format_TestData.xsd +++ b/examples/SI_Format_TestData.xsd @@ -5,10 +5,13 @@ xmlns:si="https://ptb.de/si" elementFormDefault="qualified" > - <xs:import namespace="https://ptb.de/si" schemaLocation="https://www.ptb.de/si/v2.1.0/SI_Format.xsd"/> + <xs:import namespace="https://ptb.de/si" schemaLocation="../SI_Format.xsd"/> <xs:annotation> <xs:documentation xml:lang="en"> + + https://www.ptb.de/si/v2.1.0/SI_Format.xsd + D-SI test data XSD Copyright (c) 2019 - 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved. @@ -67,10 +70,12 @@ <xs:element ref="si:complex"/> <xs:element ref="si:list"/> <xs:element ref="si:realList"/> + <xs:element ref="si:realListXMLList"/> <xs:element ref="si:complexList"/> + <xs:element ref="si:complexListXMLList"/> <xs:element ref="si:constant"/> <xs:element ref="si:hybrid"/> - <xs:element ref="si:realListXMLList"/> + </xs:choice> </xs:sequence> diff --git a/qudt/quantityKind.xsd b/qudt/quantityKind.xsd new file mode 100644 index 0000000000000000000000000000000000000000..37b8416cd8be4891a0952df1286d999bd0d3e3e0 --- /dev/null +++ b/qudt/quantityKind.xsd @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema version="1.0.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://qudt.org/vocab/" + xmlns:qudt="http://qudt.org/vocab/" + elementFormDefault="qualified"> + + <xs:simpleType name="quantityKind"> + <xs:restriction base="xs:string"/> + </xs:simpleType> + +</xs:schema>