diff --git a/COPYING.LESSER b/COPYING.LESSER
new file mode 100644
index 0000000000000000000000000000000000000000..510355ea4b0c9e4d199988c17e92306651054800
--- /dev/null
+++ b/COPYING.LESSER
@@ -0,0 +1,79 @@
+GNU LESSER GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright � 2007 Free Software Foundation, Inc. <https://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.
+
+
+0. Additional Definitions.
+
+As used herein, �this License� refers to version 3 of the GNU Lesser General Public License, and the �GNU GPL� refers to version 3 of the GNU General Public License.
+
+�The Library� refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.
+
+An �Application� is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.
+
+A �Combined Work� is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the �Linked Version�.
+
+The �Minimal Corresponding Source� for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.
+
+The �Corresponding Application Code� for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.
+
+
+1. Exception to Section 3 of the GNU GPL.
+
+You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.
+
+
+2. Conveying Modified Versions.
+
+If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:
+
+ a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or
+ b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.
+
+
+
+3. Object Code Incorporating Material from Library Header Files.
+
+The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.
+ b) Accompany the object code with a copy of the GNU GPL and this license document.
+
+
+
+4. Combined Works.
+
+You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:
+
+ a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license document.
+ c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.
+ d) Do one of the following:
+ 0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
+ 1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.
+ e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)
+
+
+
+5. Combined Libraries.
+
+You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.
+ b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
+
+
+
+6. Revised Versions of the GNU Lesser General Public License.
+
+The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License �or any later version� applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.
+
+If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.
diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index 00ce19eeec62741fcb717b14a447e284bc570980..0000000000000000000000000000000000000000
--- a/LICENSE.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2019 - Consortium of the joint research EMPIR project 17IND02 #
-# (title: SmartCom) and Physikalisch-Technische Bundesanstalt (PTB), alle #
-# Rechte vorbehalten - all rights reserved. #
-# #
-# Contact: smartcom@ptb.de #
-###############################################################################
-
- The XML scheme "SI_Format.xsd" version 1.3.0 (DOI: 10.5281/zenodo.3366902) is
- provided attributed to the CC-BY-ND 4.0 license. Please, refer to
- https://creativecommons.org/licenses/by-nd/4.0/legalcode
- for the full license.
\ No newline at end of file
diff --git a/README.md b/README.md
index 3bb58c69af0af70f50de2f89f2629a3a61ae219c..e26b73c10b2292e1cbe308b83bbed18a663df81a 100644
--- a/README.md
+++ b/README.md
@@ -1,108 +1,53 @@
-# Publication note
+<div align="center">
+ <a href="https://ptb.de/si" traget="_blank"><img src="wiki/doc/D-SI1.PNG" alt="D-SI Logo" width="500"/></a>
+ <br />
+ XSD Version 2.0.0
+ <br /><br />
-Version 1.3.1 of the D-SI reference implementation in XML is published at
+</div>
-[Latest Version at Zenodo Repository](https://doi.org/10.5281/zenodo.3816685)
+<p>
+This repository contains the XML Schema Definition (XSD), a documentation and examples for the D-SI (Digital System of Units). The XSD is licensed by Physikalisch-Technische Bundesanstalt under [GNU LGPL v3](/COPYING.LESSER). The documentation and examples are licenced by Physikalisch-Technische Bundesanstalt under [Creative Commons Attribution 4.0 International License](wiki/WIKI.LICENSE).
+</p>
-The machine-readable version of SI_Format.xsd is available at
+## Documentation
-[Digital-SI (D-SI) XML - machine-readable provision of v1.3.1 XML scheme](https://www.ptb.de/si/v1.3.1/SI_Format.xsd)
+[>> Go To WIKI](wiki/d-si-online-guide.md) to find documentation, examples and good practise
-[Digital-SI (D-SI) XML - machine-readable provision of latest XML schemes](https://www.ptb.de/si/SI_Format.xsd)
+[>> D-SI Datamodel](https://doi.org/10.5281/zenodo.3816685)
+## License
+This repository contains the XML Schema Definition (XSD), a documentation and examples for the D-SI (Digital System of Units).
-# XSD
+The XSD is licensed by Physikalisch-Technische Bundesanstalt under [GNU LGPL v3](/COPYING.LESSER).
-Schema files and instance examples for the XML implementation of the Digital System of Units (D-SI) data model.
+The documentation and examples are licenced by Physikalisch-Technische Bundesanstalt under [Creative Commons Attribution 4.0 International License](wiki/WIKI.LICENSE).
-**SI_Format.xsd Version 1.3.1 (status: ready for publication)**
+## Liability
-- minor bug fix in regex for uncertainty values
+This XSD 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. See the
+[GNU Lesser General Public License](/COPYING.LESSER) for more details.
-**SI_Format.xsd Version 1.3.0 (status: ready for publication)**
-- complete real and complex
-- real constants
-- lists of real and complex
-- hybrid for non-SI quantities
+## Access to D-SI XSD version 2.0.0
+* D-SI XSD version 2.0.0 @ [https://www.ptb.de/si/v2.0.0/SI_Format.xsd](https://www.ptb.de/si/v2.0.0/SI_Format.xsd)
-**Change History SI_Format.xsd**
+* Latest D-SI XSD version @ [https://www.ptb.de/si/SI_Format.xsd](https://www.ptb.de/si/SI_Format.xsd)
-*2019-08-13*
+* XSD for D-SI example files [https://www.ptb.de/si/v2.0.0/examples/SI_Format_TestData.xsd](https://www.ptb.de/si/v2.0.0/examples/SI_Format_TestData.xsd)
-- change element tag stdUncertainty to standardUnc (proposla from Ostfalia)
-- added examples for hybrid documentation
-*2019-08-07*
+## Development
-- changed type of all decimal values to base type xs:double (https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/issues/8#note_2117)
-- change of names and order of global unit and uncertainty statements in si:list (https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/issues/11#note_2118)
-- introduction of type for SI units based on xs:string (https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/issues/10#note_2119)
-- Introduction of sub types for uncertainty in si:real (coverage interval with mandatory std. unc.) (https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/issues/9#note_2120)
-- change of namespace to `https://ptb.de/si`
-- change of XML scheme version 1.1 to 1.0
+The master branch contains the latest stable version.
-*2019-06-17*
-
-- changed documentation of elements from comment structure to annotation elements
-- added correct EURAMET acknowledgement to disclaimer annotation.
-- removed definition of intervalType
-- updated existing documentation of all elements
-- added missing documentation for latest elements
-
-*2019-06-17*
-
-- changed element tag "valueAmplitude" to "valueMagnitude" (in complex)
-
-*2019-06-14*
-
-- updated SI test scheme to new namespace and removed reference to comma separated types
-- added new structure with global units and global bivariate uncertainty for list of complex
-- change position of global label element in list
-- added definition of recursive list of lists
-
-- update of definition of constant quantity and change of position in xsd
-- removed XML adapter in hybrid
-
-*2019-06-13*
-
-- removed comma separated value types
-- added new namespace URL https://www.ptb.de/si/smartcom/d-si/v1_2_0
-- added univariate uncertainty elements expandedUnc and coverageInterval
-- completely changed the structure of real with new univariate uncertainty elements
-- in real, the new first component is the label
-
-- added the new structure of complex quantities
-- in complex, the new first component is the label
-- added the new element for the covariance matrix
-- changed the definition of the elements for the ellipsoidal coverage region by adding the new covariance matrix element
-- changed the definition of the elements for the rectangular coverage region by adding the new covariance matrix element
-
-- checked the definition of the atomic list
-- in list, the new first component is the label
-- added a new element for global univariate and global bivariate uncertainty sub types for lists of real
-
-
-**Change History examples & wiki**
-
-*2020-02-18*
-- finalised online documentation (wiki)
-- merge of wiki brance with master
-- changed visibility of repository to public
-
-*2019-06-21*
-
-- defined categories of examples for platinum, gold, silver, bronze and improvable quality class
-- added a file with examples used in the documentation of version 1.2 of the D-SI data model (*SmartCom_A1.2.3_examples.xml*)
-- moved old examples of previous version of D-SI format to folder *examples_deprecated*
-- removed proposals folder - use issue section to make proposals on changes (including the option to fork / merge requests)
-
-- removed old examples folder *examples_deprecated*
diff --git a/SI_Format.xsd b/SI_Format.xsd
index c49b0bd1ceb0da0db676130c65ba77b3c5c65b57..c9b2f62a8f8227f66620b4c9b6af69d038231c2f 100644
--- a/SI_Format.xsd
+++ b/SI_Format.xsd
@@ -1,43 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema version="1.3.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+<xs:schema version="2.0.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="https://ptb.de/si"
xmlns:si="https://ptb.de/si"
elementFormDefault="qualified">
<xs:annotation>
<xs:documentation xml:lang="en">
- Copyright (c) 2019 - EMPIR project 17IND02 (title: SmartCom) consortium and Physikalisch-Technische Bundesanstalt (PTB),
- alle Rechte vorbehalten - all rights reserved. This XML scheme is provided attributed to the CC-BY-ND 4.0 license.
- Please, refer to https://creativecommons.org/licenses/by-nd/4.0/legalcode for the full license.
- </xs:documentation>
- <xs:documentation xml:lang="en">
- This XML scheme implements the Digital-SI (D-SI) data model for a transmission of metrological data in digital
- applications.
- AUTHORS
- Physikalisch-Technische Bundesanstalt (DE): Daniel Hutzschenreuter, Frank Härtig, Thomas Wiedenhöfer,
- Siegfried Gustav Hackel, Alexander Scheibner, Wiebke Heeren;
- National Physical Laboratory (UK): Ian Smith, Clifford Brown
- CONTACT
- smartcom@ptb.de
- WEBPAGE
- https://www.ptb.de/empir2018/smartcom/home/
- VERSION
- 1.3.1
- DATE
- 2020-05-18
- DOI:
- 10.5281/zenodo.3826517
- </xs:documentation>
- <xs:documentation xml:lang="en">
- DISCLAIMER:
- This XML scheme was developed by the EMPIR project 17IND02 (title: SmartCom) consortium under the lead of
- Physikalisch-Technische Bundesanstalt (PTB). The XML scheme is made available “as is“
- free of cost at your own risk. Members of the EMPIR project 17IND02 (SmartCom) consortium and the Physikalisch-Technische
- Bundesanstalt assume no responsibility whatsoever for its use by other parties, and makes no guarantees, expressed or
- implied, about its quality, reliability, safety, suitability or any other characteristic. As far as legally permitted,
- the members of the EMPIR project 17IND02 (SmartCom) consortium and the Physikalisch-Technische Bundesanstalt refuse
- any liability for any direct, indirect or consequential damage arising in connection with the use of this XML scheme.
- </xs:documentation>
+ D-SI - Digital System of Units
+ Copyright (c) 2019 - 2021 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
+ the Free Software Foundation, version 3 of the License.
+
+ This XSD 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. See the
+ GNU Lesser General Public License for more details.
+
+ 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
+ DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
+ D-SI XSD VERSION: 2.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+ </xs:documentation>
<xs:documentation xml:lang="en">
ACKNOWLEDGEMENT:
The development of the XML scheme is part of the research project EMPIR 17IND02 (title: SmartCom).
@@ -48,16 +37,14 @@
- <!--
- ##############################################################################################
- First part of the XML-schema: Elements for the SI-based exchange of measured quantities.
- ##############################################################################################
- -->
+
+
+ <!-- ############## D-SI XML ELEMENT DEFINITIONS FOR MEASUREMETN DATA EXCHANGE #################### -->
- <xs:element name="real">
+ <xs:element name="real" type="si:realQuantityType">
<xs:annotation>
<xs:documentation xml:lang="en">
- Meta data element definition for a real measurement quantity.
+ Metadata element definition for a real measurement quantity.
</xs:documentation>
<xs:documentation xml:lang="en">
<![CDATA[
@@ -69,22 +56,13 @@
(m) - element value (decimal value type)
(m) - element unit (string - SI format)
(o) - element dateTime (xs:dateTime)
-
-
- 2. Measured quantity with expanded measurement uncertainty
+
+ 2. Measured quantity with univariate measurement uncertainty
(o) - element label (string)
(m) - element value (decimal value type)
(m) - element unit (string - SI format)
(o) - element dateTime (xs:dateTime)
- (m) - element expandedUnc (element type expandedUnc - sub structure)
-
-
- 3. Measured quantity with uncertainty coverage interval (probabilistic-symmetric)
- (o) - element label (string)
- (m) - element value (decimal value type)
- (m) - element unit (string - SI format)
- (o) - element dateTime (xs:dateTime)
- (m) - element coverageInterval (element type coverageInterval - sub structure)
+ (m) - choice si:expandedUnc or si:coverageInterval for the univaraite uncertainty
]]>
</xs:documentation>
<xs:documentation xml:lang="en">
@@ -102,99 +80,10 @@
]]>
</xs:documentation>
</xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <!-- optional label -->
- <xs:element name="label" 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 choice of uncertainty statements -->
- <xs:choice minOccurs="0">
- <xs:element ref="si:expandedUnc"/>
- <xs:element ref="si:coverageInterval"/>
- </xs:choice>
-
- </xs:sequence>
-
- </xs:complexType>
- </xs:element>
-
-
- <xs:element name="expandedUnc">
- <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.
- </xs:documentation>
- <xs:documentation xml:lang="en">
- <![CDATA[
- The element has the following components [(m)-mandatory, (o)-optional]:
-
- (m) - element uncertainty (decimal value >= 0)
- (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:complexType>
- <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:element>
- <xs:element name="coverageInterval">
- <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]:
-
- (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)
-
- 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:complexType>
- <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>
-
-
- <xs:element name="constant">
+ <xs:element name="constant" type="si:constantQuantityType">
<xs:annotation>
<xs:documentation xml:lang="en">
Definition of a structure for real numbers, that represent for fundamental
@@ -221,33 +110,13 @@
]]>
</xs:documentation>
</xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <!-- optional label -->
- <xs:element name="label" 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:element>
-
-
-
- <xs:element name="complex">
+
+
+ <xs:element name="complex" type="si:complexQuantityType">
<xs:annotation>
<xs:documentation xml:lang="en">
- The definition of complex quantities in the D-SI meta data model.
+ The definition of complex quantities in the D-SI metadata model.
Complex quantities allow two representations of complex numerical values:
One is the Cartesian coordinate form, the other representation is the
polar coordinate form.
@@ -274,408 +143,86 @@
(o) - element dateTime (xs:dateTime)
- 3. Basic measured quantity in Cartesian form with ellipsoidal coverage region
- (o) - element label (string)
- (m) - element valueReal (decimal value type)
- (m) - element valueImag (decimal value type)
- (m) - element unit (string - SI unit)
- (o) - element dateTime (xs:dateTime)
- (m) - element ellipsoidalRegion (element type ellipsoidalRegion - sub structure)
-
-
- 4. Basic measured quantity in polar form with ellipsoidal coverage region
- (o) - element label (string)
- (m) - element valueMagnitude (decimal value type)
- (m) - element valuePhase (decimal value type)
- (m) - element unit (string - SI unit)
- (m) - element unitPhase (string - SI unit for an angular quantity)
- (o) - element dateTime (xs:dateTime)
- (m) - element ellipsoidalRegion (element type ellipsoidalRegion - sub structure)
-
-
- 5. Basic measured quantity in Cartesian form with rectangular coverage region
+ 3. Basic measured quantity in Cartesian form with bivariate uncertainty
(o) - element label (string)
(m) - element valueReal (decimal value type)
(m) - element valueImag (decimal value type)
(m) - element unit (string - SI unit)
(o) - element dateTime (xs:dateTime)
- (m) - element rectangularRegion (element type rectangularRegion - sub structure)
+ (m) - choice si:ellipsoidalRegion or si:rectangularRegion for the bivariate uncertainty
- 6. Basic measured quantity in polar form with rectangular coverage region
+ 4. Basic measured quantity in polar form with bivariate uncertainty
(o) - element label (string)
(m) - element valueMagnitude (decimal value type)
(m) - element valuePhase (decimal value type)
(m) - element unit (string - SI unit)
(m) - element unitPhase (string - SI unit for an angular quantity)
(o) - element dateTime (xs:dateTime)
- (m) - element rectangularRegion (element type rectangularRegion - sub structure)
+ (m) - choice si:ellipsoidalRegion or si:rectangularRegion for the bivariate uncertainty
]]>
</xs:documentation>
</xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <!-- optional label -->
- <xs:element name="label" 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 ref="si:ellipsoidalRegion"/>
- <xs:element ref="si:rectangularRegion"/>
- </xs:choice>
- </xs:sequence>
- </xs:complexType>
</xs:element>
-
- <!-- -->
- <xs:element name="covarianceMatrix">
+
+ <xs:element name="realList" type="si:realListType">
<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.
+ Meta data element definition for a list of real measurement quantities.
+ The list can represent independent measurement or multivariate vector quantities.
</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.
+ A list can provide the following structures:
+ - list of one ore more si:real elements
+ - 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:complexType>
- <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>
-
-
- <xs:element name="ellipsoidalRegion">
+ <xs:element name="complexList" type="si:complexListType">
<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.
+ 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:complexType>
- <xs:sequence>
- <!-- covariance matrix data -->
- <xs:element ref="si:covarianceMatrix"/>
- <!-- 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:element>
-
-
- <!-- Structure under development by NPL and PTB -->
- <xs:element name="rectangularRegion">
+
+ <xs:element name="list" type="si:listType">
<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.
+ 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[
- 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 nested structures:
+ - si:list elements and
+ - si:realList elements and
+ - si:complexList elements
]]>
</xs:documentation>
</xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <!-- covariance matrix data -->
- <xs:element ref="si:covarianceMatrix"/>
- <!-- 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:element>
-
-
-
- <xs:element name="list">
- <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[
- A list can provide the following structures:
-
- 1: A list of si:real quantities
- - 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
-
- 2: A list of si:complex quantities
- - 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
-
- 3: A recursive list of si:list elements
- - optional global timestamp and/or global label
- ]]>
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <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"/>
-
- <!-- selection between list of lists and list of real or complex -->
- <xs:choice>
-
- <!-- list of real or complex -->
- <xs:sequence>
- <!-- optional list unit -->
- <xs:element name="listUnit" type="si:unitType" minOccurs="0"/>
-
- <!-- selection of real or complex type -->
- <xs:choice>
-
- <!-- list of real elements -->
- <xs:sequence>
- <!-- optional list uncertainty -->
- <xs:element ref="si:listUnivariateUnc" minOccurs="0"/>
- <!-- mandatory list of real elements -->
- <xs:element name="real" 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:complexType>
- <xs:sequence>
- <!-- optional local label -->
- <xs:element name="label" 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:choice minOccurs="0">
- <xs:element ref="si:expandedUnc"/>
- <xs:element ref="si:coverageInterval"/>
- </xs:choice>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
-
-
- <!-- list of complex elements -->
- <xs:sequence>
- <xs:element name="listUnitPhase" type="xs:string" minOccurs="0"/>
- <!-- optional list bivariate uncertainty -->
- <xs:element ref="si:listBivariateUnc" minOccurs="0"/>
- <!-- mandatory list of complex elements -->
- <xs:element name="complex" maxOccurs="unbounded">
- <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.
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <!-- optional local label -->
- <xs:element name="label" 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"/>
- <!-- if list unit, then do not write this local unit -->
- <xs:element name="unit" type="si:unitType" minOccurs="0"/>
- </xs:sequence>
- <xs:sequence>
- <!-- mandatory components of polar coordinate form -->
- <xs:element name="valueMagnitude" type="si:decimalType"/>
- <xs:element name="valuePhase" type="si:decimalType"/>
- <!-- if list unit, then do not write this local unit -->
- <xs:element name="unit" type="si:unitType" minOccurs="0"/>
- <!-- if list unit, then do not write this local unit -->
- <xs:element name="unitPhase" type="si:unitPhaseType" minOccurs="0"/>
- </xs:sequence>
- </xs:choice>
- <!-- optional local time stamp -->
- <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/>
- <!-- optional choice of local uncertainty statements -->
- <xs:choice minOccurs="0">
- <xs:element ref="si:ellipsoidalRegion"/>
- <xs:element ref="si:rectangularRegion"/>
- </xs:choice>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
-
- </xs:choice>
-
- <!-- optional multivariate uncertainty statement -->
- <xs:choice minOccurs="0">
- <xs:element ref="si:ellipsoidalRegion"/>
- <xs:element ref="si:rectangularRegion"/>
- </xs:choice>
- </xs:sequence>
- <!-- end of list of real or complex quantities -->
-
-
-
- <!-- list of lists -->
- <xs:sequence>
- <!-- mandatory list of complex elements -->
- <xs:element ref="si:list" maxOccurs="unbounded"/>
- </xs:sequence>
-
- </xs:choice>
- </xs:sequence>
- </xs:complexType>
</xs:element>
- <!-- -->
- <xs:element name="listUnivariateUnc">
- <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:complexType>
- <xs:sequence>
- <xs:choice>
- <xs:element ref="si:expandedUnc"/>
- <xs:element ref="si:coverageInterval"/>
- </xs:choice>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <!-- -->
- <xs:element name="listBivariateUnc">
- <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:complexType>
- <xs:sequence>
- <xs:choice>
- <xs:element ref="si:ellipsoidalRegion"/>
- <xs:element ref="si:rectangularRegion"/>
- </xs:choice>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
-
-
-
-
-
<!-- -->
- <xs:element name="hybrid">
+ <xs:element name="hybrid" type="si:hybridType">
<xs:annotation>
<xs:documentation xml:lang="en">
The hybrid elements allows to add quantities to the
@@ -698,7 +245,7 @@
- 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 element
+ 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
@@ -713,28 +260,532 @@
]]>
</xs:documentation>
</xs:annotation>
- <xs:complexType>
+ </xs:element>
+
+
+
+<!-- ############## D-SI SUPPLEMENTAL XML ELEMENT DEFINITIONS #################### -->
+
+ <xs:element name="expandedUnc" type="si:expandedUncType">
+ <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.
+ </xs:documentation>
+ <xs:documentation xml:lang="en">
+ <![CDATA[
+ The element has the following components [(m)-mandatory, (o)-optional]:
+
+ (m) - element uncertainty (decimal value >= 0)
+ (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: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]:
+
+ (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)
+
+ 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>
+
+
+ <!-- -->
+ <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">
+ 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">
+ 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>
+
+
+
+<!-- ############## D-SI XML TYPE DEFINITIONS #################### -->
+
+ <xs:complexType name="realQuantityType">
+ <xs:sequence>
+ <!-- optional label and quantity type-->
+ <xs:element name="label" 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 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="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"/>
+
+ <!-- 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"/>
+
+ <!-- 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="realInListType">
+ <xs:sequence>
+ <!-- optional local label and local quantity type-->
+ <xs:element name="label" 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:choice minOccurs="0">
+ <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:sequence>
+ </xs:complexType>
+
+
+ <xs:complexType name="complexInListType">
+ <xs:sequence>
+ <!-- optional local label and local quantity type-->
+ <xs:element name="label" 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"/>
+ <!-- if list unit, then do not write this local unit -->
+ <xs:element name="unit" type="si:unitType" minOccurs="0"/>
+ </xs:sequence>
+ <xs:sequence>
+ <!-- mandatory components of polar coordinate form -->
+ <xs:element name="valueMagnitude" type="si:decimalType"/>
+ <xs:element name="valuePhase" type="si:decimalType"/>
+ <!-- if list unit, then do not write this local unit -->
+ <xs:element name="unit" type="si:unitType" minOccurs="0"/>
+ <!-- if list unit, then do not write this local unit -->
+ <xs:element name="unitPhase" type="si:unitPhaseType" minOccurs="0"/>
+ </xs:sequence>
+ </xs:choice>
+ <!-- optional local time stamp -->
+ <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/>
+
+ <!-- optional local 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="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 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>
+
+
+ <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 unit -->
+ <xs:element name="listUnit" type="si:unitType" minOccurs="0"/>
+ <xs:element name="listUnitPhase" type="xs:string" minOccurs="0"/>
+ <!-- optional list bivariate uncertainty -->
+
+ <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">
+ <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.
+ </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="listType">
+ <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"/>
+
+ <!-- selection between list of lists and list of real or complex -->
+ <xs:choice maxOccurs="unbounded">
+ <!-- either list of real -->
+ <xs:element name="realList" type="si:realListType"/>
+ <!-- or list of complex -->
+ <xs:element name="complexList" type="si:complexListType"/>
+ <!-- or list of lists -->
+ <xs:element name="list" type="si:listType"/>
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
+
+
+ <xs:complexType name="hybridType">
<xs:sequence>
<!-- mandatory adapter for at least one SI quantity and additional (non-) SI quantities -->
<xs:choice>
- <xs:element ref="si:real" minOccurs="1" maxOccurs="unbounded" />
- <xs:element ref="si:complex" minOccurs="1" maxOccurs="unbounded"/>
- <xs:element ref="si:list" minOccurs="1" maxOccurs="unbounded"/>
- <xs:element ref="si:constant" minOccurs="1" maxOccurs="unbounded"/>
+ <xs:element name="real" type="si:realQuantityType" minOccurs="1" maxOccurs="unbounded"/>
+ <xs:element name="complex" type="si:complexQuantityType" minOccurs="1" maxOccurs="unbounded"/>
+ <xs:element name="list" type="si:listType" minOccurs="1" maxOccurs="unbounded"/>
+ <xs:element name="realList" type="si:realListType" minOccurs="1" maxOccurs="unbounded"/>
+ <xs:element name="complexList" type="si:complexListType" minOccurs="1" maxOccurs="unbounded"/>
+ <xs:element name="constant" type="si:constantQuantityType" minOccurs="1" maxOccurs="unbounded"/>
</xs:choice>
</xs:sequence>
</xs:complexType>
- </xs:element>
-
-
+
+
+ <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="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: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: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="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>
+
+
+
+
- <!--
- ##############################################################################################
- Second part of the XML-schema: internally used simple data types.
- ##############################################################################################
- -->
+<!-- ############## D-SI XML INTERNALLY USED SIMPLE TYPE DEFINITIONS #################### -->
<xs:simpleType name="unitType">
<xs:annotation>
@@ -747,6 +798,7 @@
</xs:restriction>
</xs:simpleType>
+
<xs:simpleType name="unitPhaseType">
<xs:annotation>
<xs:documentation xml:lang="en">
@@ -757,6 +809,7 @@
<xs:restriction base="xs:string">
</xs:restriction>
</xs:simpleType>
+
<xs:simpleType name="decimalType">
<xs:annotation>
@@ -769,6 +822,7 @@
<xs:pattern value="[-+]?((\d*\.\d+)|(\d+\.\d*)|(\d+\.?))([Ee][-+]?\d+)?"/>
</xs:restriction>
</xs:simpleType>
+
<xs:simpleType name="uncertaintyValueType">
<xs:annotation>
@@ -796,6 +850,7 @@
<xs:pattern value="\+?(([1-9]\d*\.\d*)|([1-9]\d*))"/>
</xs:restriction>
</xs:simpleType>
+
<xs:simpleType name="probabilityValueType">
<xs:annotation>
diff --git a/examples/BRONZE/2020-03-20-UM-BRONZE-examples.xml b/examples/BRONZE/2020-03-20-UM-BRONZE-examples.xml
index 69f80425758c095895928a6097486723c86de99e..bf4499e43dcd929e7349a91b2027ec7d84de664f 100644
--- a/examples/BRONZE/2020-03-20-UM-BRONZE-examples.xml
+++ b/examples/BRONZE/2020-03-20-UM-BRONZE-examples.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation=" https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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 for SmartCom D-SI data with quality class BRONZE (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class BRONZE (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="UM10">
@@ -19,7 +40,7 @@
</siTest:testData>
<siTest:testData id="UM24">
- <si:list>
+ <si:complexList>
<si:listUnit>\bar</si:listUnit>
<si:listBivariateUnc>
<si:ellipsoidalRegion>
@@ -58,12 +79,12 @@
<si:valueReal>-10.510</si:valueReal>
<si:valueImag>5.510</si:valueImag>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="UM29">
<si:list>
- <si:list>
+ <si:realList>
<si:real>
<si:value>315.405</si:value>
<si:unit>\decibel</si:unit>
@@ -72,8 +93,8 @@
<si:value>240.224</si:value>
<si:unit>\decibel</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:value>4.34</si:value>
<si:unit>\weber</si:unit>
@@ -82,8 +103,8 @@
<si:value>5.34</si:value>
<si:unit>\weber</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:value>1.035</si:value>
<si:unit>\knot</si:unit>
@@ -92,8 +113,8 @@
<si:value>0.9875</si:value>
<si:unit>\knot</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/BRONZE/PTB-BRONZE-examples-2.xml b/examples/BRONZE/PTB-BRONZE-examples-2.xml
index c2660942dec99306b50356924396865af5afee3d..01409d9d67479118f791146a038badffce9f317f 100644
--- a/examples/BRONZE/PTB-BRONZE-examples-2.xml
+++ b/examples/BRONZE/PTB-BRONZE-examples-2.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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 for SmartCom D-SI data with quality class BRONZE (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class BRONZE (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB534">
@@ -17,4 +38,4 @@
</si:complex>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/BRONZE/PTB-BRONZE-examples.xml b/examples/BRONZE/PTB-BRONZE-examples.xml
index a4dc646cc92914d2ff0772ff4b79038177ee3181..55b59fc92fa8cae954a17b82503ce27187fc91c5 100644
--- a/examples/BRONZE/PTB-BRONZE-examples.xml
+++ b/examples/BRONZE/PTB-BRONZE-examples.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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 for SmartCom D-SI data with quality class BRONZE (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class BRONZE (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB55">
@@ -115,7 +136,7 @@
</siTest:testData>
<siTest:testData id="PTB238">
- <si:list>
+ <si:realList>
<si:listUnit>\planckbar</si:listUnit>
<si:real>
<si:value>1.0</si:value>
@@ -123,11 +144,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB243">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\kelvin</si:unit>
@@ -136,33 +157,33 @@
<si:value>1.0</si:value>
<si:unit>\planckbar</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB288">
<si:list>
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
<si:unit>\mmhg</si:unit>
</si:complex>
- </si:list>
- <si:list>
+ </si:complexList>
+ <si:realList>
<si:real>
<si:value>1.34</si:value>
<si:unit>\metre</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</siTest:testData>
<siTest:testData id="PTB999">
- <si:list>
+ <si:realList>
<si:listUnit>\bar</si:listUnit>
<si:real>
<si:value>1.0</si:value>
@@ -197,7 +218,7 @@
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal-bivariate</si:distribution>
</si:ellipsoidalRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/EXAMPLES.LICENSE b/examples/EXAMPLES.LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..335af1f6ee8708f5e41b80d5f7d378908ccb410f
--- /dev/null
+++ b/examples/EXAMPLES.LICENSE
@@ -0,0 +1,95 @@
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+
+Section 1 � Definitions.
+
+ a) Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
+ b) Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
+ c) Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+ d) Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
+ e) Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
+ f) Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+ g) Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
+ h) Licensor means the individual(s) or entity(ies) granting rights under this Public License.
+ i) Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
+ j) Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
+ k) You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
+
+Section 2 � Scope.
+
+ a) License grant.
+ 1) Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+ A) reproduce and Share the Licensed Material, in whole or in part; and
+ B) produce, reproduce, and Share Adapted Material.
+ 2) Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
+ 3) Term. The term of this Public License is specified in Section 6(a).
+ 4) Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
+ 5) Downstream recipients.
+ A) Offer from the Licensor � Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
+ B) No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
+ 6) No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
+
+ b) Other rights.
+ 1) Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
+ 2) Patent and trademark rights are not licensed under this Public License.
+ 3) To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
+
+Section 3 � License Conditions.
+
+ Your exercise of the Licensed Rights is expressly made subject to the following conditions.
+
+ a) Attribution.
+
+ 1) If You Share the Licensed Material (including in modified form), You must:
+ A) retain the following if it is supplied by the Licensor with the Licensed Material:
+ i) identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
+ ii) a copyright notice;
+ iii) a notice that refers to this Public License;
+ iv) a notice that refers to the disclaimer of warranties;
+ v) a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+ B) indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
+ C) indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
+ 2) You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
+ 3) If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
+ 4) If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License.
+
+Section 4 � Sui Generis Database Rights.
+
+ Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
+
+ a) for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
+ b) if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and
+ c) You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
+
+ For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+
+Section 5 � Disclaimer of Warranties and Limitation of Liability.
+
+ a) Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
+ b) To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
+
+ c) The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+Section 6 � Term and Termination.
+
+ a) This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
+
+ b) Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
+ 1) automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
+ 2) upon express reinstatement by the Licensor.
+ For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
+ c) For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
+ d) Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+Section 7 � Other Terms and Conditions.
+
+ a) The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
+ b) Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
+
+Section 8 � Interpretation.
+
+ a) For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
+ b) To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
+ c) No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
+ d) Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
\ No newline at end of file
diff --git a/examples/Example-Meta.md b/examples/Example-Meta.md
new file mode 100644
index 0000000000000000000000000000000000000000..6afc1370fddaa147920f8bbdbd93c1d5f12049e1
--- /dev/null
+++ b/examples/Example-Meta.md
@@ -0,0 +1,433 @@
+# XML Example Metadata
+
+Overview on the XMl examples and clasification Metadata
+
+## 1. PTB examples
+
+| Example ID| Medal | Properties of example |
+| --- | ------ |----------|
+|PTB1 | PLATINUM | Unit: metre (SI base unit)|
+|PTB2 | PLATINUM | Unit: metre metre (SI base unit)|
+|PTB3 | PLATINUM | Unit: degree metre (extended SI base unit and SI base unit)|
+|PTB4 | PLATINUM | Unit: one minute arcsecond (extended SI base unit)|
+|PTB5 | PLATINUM | Unit: kg m2 A-1 s-2 (SI base unit with exponent)|
+|PTB6 | PLATINUM | Unit: kg m0.5 A-1 s-2 (SI base unit with root exponent)|
+|PTB7 | GOLD | Unit: degreecelsius (derived SI unit)|
+|PTB8 | GOLD | Unit: kilometre (SI base unit with prefix)|
+|PTB9 | GOLD | Unit: newton (derived SI unit)|
+|PTB10 | GOLD | Unit: newton per second (derived SI unit)|
+|PTB11 | GOLD | Unit: kilometre per hour (SI base unit with prefix)|
+|PTB12 | GOLD | Unit: nanocandela (SI base unit with prefix)|
+|PTB13 | SILVER | Unit: litre (non-SI with own identifier in SI)|
+|PTB14 | SILVER | Unit: electronvolt (non-SI with own identifier in SI)|
+|PTB15 | GOLD | Unit: milligram (SI with prefix)|
+|PTB16 | SILVER | Unit: kilobel (non SI with own identifier in SI and with prefix)|
+|PTB17 | IMPROVABLE | Unit: spelling of "meter" is not allowed|
+|PTB18 | IMPROVABLE | Unit: spelling of "liter" is not allowed|
+|PTB19 | IMPROVABLE | Unit: "\one" with a prefix is not permitted|
+|PTB20 | IMPROVABLE | Unit: "\one" with an exponent is not permitted|
+|PTB21 | IMPROVABLE | Unit: "\kilo\gram" forbidden|
+|PTB22 | IMPROVABLE | Unit: "kilogram" with a prefix is not permitted|
+|PTB23 | IMPROVABLE | Unit: "\deci\bel" forbidden|
+|PTB24 | IMPROVABLE | Unit: "\decibel" with a prefix is not permitted|
+|PTB25 | IMPROVABLE | Unit: two prefixes with a single unit are not permitted|
+|PTB26 | IMPROVABLE | Unit: two exponents with a single unit not permitted|
+|PTB27 | PLATINUM | Unit: "\one" (extended SI base unit)|
+|PTB28 | PLATINUM | Unit: "\mole\one" (SI base unit and extended SI base unit)|
+|PTB30 | IMPROVABLE | Unit: "\kilogram" with a prefix not permitted|
+|PTB31 | GOLD | Unit: kg m2 mA-1 s-2 (SI base unit with prefix)|
+|PTB32 | IMPROVABLE | Unit: "\tothe{-1}" identifier is unknown|
+|PTB33 | IMPROVABLE | Unit: exponents 2.5 and 2.324 in unit are not permitted|
+|PTB34 | SILVER | Unit: eV m2 A-1 Da hs-2 (non-SI with own identifier in SI)|
+|PTB35 | IMPROVABLE | Unit: nested brackets are not permitted|
+|PTB36 | IMPROVABLE | Unit: "/" identifier is not permitted|
+|PTB37 | IMPROVABLE | Unit: exponent "2/3" in unit is not permitted|
+|PTB38 | IMPROVABLE | Unit: exponent "\metre" in unit is not permitted|
+|PTB39 | IMPROVABLE | Unit: Exponent \tothe{-2} must have a unit as predecessors|
+|PTB40 | IMPROVABLE | Unit: two prefixes with a single unit are not permitted|
+|PTB41 | IMPROVABLE | Unit: Exponent ""\tothe{-1}"" must have a unit as predecessors; Prefix ""\micro"" must be followed by a unit|"
+|PTB42 | IMPROVABLE | Unit: "\tothe{2}+" and "\tothe{-1}-" are illegal identifiers|
+|PTB43 | IMPROVABLE | Unit: "\tothe{2\kilogram}" illegal character in exponent|
+|PTB44 | IMPROVABLE | Unit: illegal escape sequence "\\t" and "\\s" |
+|PTB45 | IMPROVABLE | Unit: comma is not permited as decimal seperator - use dot instead|
+|PTB46 | IMPROVABLE | Unit: ""\millimetre"" is not written in the correct way; Exponent ""^-2"" is not allowed|"
+|PTB47 | IMPROVABLE | Unit: two exponents with a single unit are not permitted |
+|PTB48 | IMPROVABLE | Unit: Exponent ""\tothe{-1}"" must have a unit as predecessors; Comma is not permited as decimal seperator;""\nanoampere"" is not correctly written; Two prefixes with a single unit is not permitted; Prefix ""\micro"" must be followed by a unit; Exponents ""\tothe{{ 0,5}"", ""\tothe{-2/3*kg}"" and ""\tothe{}"" are illegal |"
+|PTB49 | IMPROVABLE | Unit: "\tothe{}" is missing a exponent value|
+|PTB50 | IMPROVABLE | Unit: illegal blank spaces|
+|PTB51 | IMPROVABLE | Unit: "\tothe{2e2}" are illegal characters in exponent|
+|PTB52 | IMPROVABLE | Unit: illegal blank spaces in exponent value|
+|PTB53 | IMPROVABLE | Unit: "" are illegal characters in exponent|
+|PTB54 | IMPROVABLE | Unit: Tab is not allowed in unit|
+|PTB55 | BRONZE | Unit: bar (non-SI units allowed with the 8th edition of the SI)|
+|PTB56 | BRONZE | Unit: mmhg (non-SI units allowed with the 8th edition of the SI)|
+|PTB57 | IMPROVABLE | Unit is empty|
+|PTB58 | IMPROVABLE | Unit: Backslash is missing|
+|PTB59 | IMPROVABLE | Unit: mmhg must be lowecase|
+|PTB60 | IMPROVABLE | Unit: degreecelsius must be lowecase|
+|PTB61 | PLATINUM | Unit: kg m2 s-1 (SI base unit)|
+|PTB62 | IMPROVABLE | Unit: mm2 ns1 (too many prefixes not allowed)|
+|PTB63 | IMPROVABLE | Unit: mm-1 ns-1 (too many prefixes not allowed)|
+|PTB64 | GOLD | Unit: mm2 ns-1 (SI base unit with prefixes)|
+|PTB65 | IMPROVABLE | Unit: mm2 ns0 (too many prefixes not allowed)|
+|PTB66 | GOLD | Unit: mm0 ns-1 (SI base unit with prefixes)|
+|PTB67 | IMPROVABLE | Unit: mm0 ns0 (too many prefixes not allowed)|
+|PTB68 | IMPROVABLE | Unit: mm-0 ns-0 (too many prefixes not allowed)|
+|PTB69 | IMPROVABLE | Unit: mm+0 ns-0 (too many prefixes not allowed)|
+|PTB70 | IMPROVABLE | Unit: Prefix "\milli" is not allowed|
+|PTB71 | IMPROVABLE | Unit: Prefix "\milli" is not allowed|
+|PTB72 | IMPROVABLE | Unit: Prefix "\milli" is not allowed|
+|PTB73 | IMPROVABLE | Unit: Prefix "\milli" is not allowed|
+|PTB74 | IMPROVABLE | Unit: Prefix "\milli" is not allowed|
+|PTB75 | IMPROVABLE | Unit: Prefix "\milli" is not allowed|
+|PTB76 | IMPROVABLE | Unit: Prefix "\milli" is not allowed|
+|PTB77 | IMPROVABLE | Unit: Prefix "\milli" is not allowed|
+|PTB80 | IMPROVABLE | Unit: A0.2 (exponent 0.2 not allowed)|
+|PTB81 | PLATINUM | Unit: A+0 (SI base unit with exponent)|
+|PTB82 | PLATINUM | Unit: A-0 (SI base unit with exponent)|
+|PTB83 | PLATINUM | Unit: A+0.5 (SI base unit with exponent)|
+|PTB84 | PLATINUM | Unit: A-005 (SI base unit with exponent)|
+|PTB85 | PLATINUM | Unit: A-0.5 (SI base unit with exponent)|
+|PTB86 | PLATINUM | Unit: kilogram (SI base unit)|
+|PTB87 | PLATINUM | Unit: second (SI base unit)|
+|PTB88 | PLATINUM | Unit: ampere (SI base unit)|
+|PTB89 | PLATINUM | Unit: kelvin (SI base unit)|
+|PTB90 | PLATINUM | Unit: mole (SI base unit)|
+|PTB91 | PLATINUM | Unit: candela (SI base unit)|
+|PTB92 | PLATINUM | Unit: one (extended SI base unit)|
+|PTB93 | PLATINUM | Unit: degree (extended SI base unit)|
+|PTB94 | PLATINUM | Unit: arcminute (extended SI base unit)|
+|PTB95 | PLATINUM | Unit: arcsecond (extended SI base unit)|
+|PTB96 | PLATINUM | Unit: day (extended SI base unit)|
+|PTB97 | PLATINUM | Unit: hour (extended SI base unit)|
+|PTB98 | PLATINUM | Unit: minute (extended SI base unit)|
+|PTB99 | GOLD | Unit: gram (derived SI unit)|
+|PTB100 | GOLD | Unit: radian (derived SI unit)|
+|PTB101 | GOLD | Unit: steradian (derived SI unit)|
+|PTB102 | GOLD | Unit: hertz (derived SI unit)|
+|PTB103 | GOLD | Unit: pascal (derived SI unit)|
+|PTB104 | GOLD | Unit: joule (derived SI unit)|
+|PTB105 | GOLD | Unit: watt (derived SI unit)|
+|PTB106 | GOLD | Unit: coulomb (derived SI unit)|
+|PTB107 | GOLD | Unit: volt (derived SI unit)|
+|PTB108 | GOLD | Unit: farad (derived SI unit)|
+|PTB109 | GOLD | Unit: ohm (derived SI unit)|
+|PTB110 | GOLD | Unit: siemens (derived SI unit)|
+|PTB111 | GOLD | Unit: weber (derived SI unit)|
+|PTB112 | GOLD | Unit: tesla (derived SI unit)|
+|PTB113 | GOLD | Unit: henry (derived SI unit)|
+|PTB114 | GOLD | Unit: lumen (derived SI unit)|
+|PTB115 | GOLD | Unit: lux (derived SI unit)|
+|PTB116 | GOLD | Unit: becquerel (derived SI unit)|
+|PTB117 | GOLD | Unit: sievert (derived SI unit)|
+|PTB118 | GOLD | Unit: gray (derived SI unit)|
+|PTB119 | GOLD | Unit: katal (derived SI unit)|
+|PTB120 | GOLD | Unit: decametre (SI base unit with prefix)|
+|PTB121 | GOLD | Unit: hectometre (SI base unit with prefix) |
+|PTB122 | GOLD | Unit: megametre (SI base unit with prefix)|
+|PTB123 | GOLD | Unit: gigametre (SI base unit with prefix)|
+|PTB124 | GOLD | Unit: terametre (SI base unit with prefix)|
+|PTB125 | GOLD | Unit: petametre (SI base unit with prefix)|
+|PTB126 | GOLD | Unit: exametre (SI base unit with prefix)|
+|PTB127 | GOLD | Unit: zettametre (SI base unit with prefix)|
+|PTB128 | GOLD | Unit: yottametre (SI base unit with prefix)|
+|PTB129 | GOLD | Unit: decimetre (SI base unit with prefix)|
+|PTB130 | GOLD | Unit: centimetre (SI base unit with prefix)|
+|PTB131 | GOLD | Unit: millimetre (SI base unit with prefix)|
+|PTB132 | GOLD | Unit: micrometre (SI base unit with prefix)|
+|PTB133 | GOLD | Unit: nanometre (SI base unit with prefix)|
+|PTB134 | GOLD | Unit: picometre (SI base unit with prefix)|
+|PTB135 | GOLD | Unit: femtometre (SI base unit with prefix)|
+|PTB136 | GOLD | Unit: attometre (SI base unit with prefix)|
+|PTB137 | GOLD | Unit: zeptometre (SI base unit with prefix)|
+|PTB138 | GOLD | Unit: yoctometre (SI base unit with prefix)|
+|PTB139 | SILVER | Unit: hectare (non-SI unit with own identifier)|
+|PTB140 | SILVER | Unit: tonne (non-SI unit with own identifier)|
+|PTB141 | SILVER | Unit: dalton (non-SI unit with own identifier)|
+|PTB142 | SILVER | Unit: astronomicalunit (non-SI unit with own identifier)|
+|PTB143 | SILVER | Unit: neper (non-SI unit with own identifier)|
+|PTB144 | SILVER | Unit: bel (non-SI unit with own identifier)|
+|PTB145 | SILVER | Unit: decibel (non-SI unit with own identifier)|
+|PTB146 | BRONZE | Unit: angstrom (non-SI units allowed with the 8th edition of the SI)|
+|PTB147 | BRONZE | Unit: atomicunittime (non-SI units allowed with the 8th edition of the SI)|
+|PTB148 | BRONZE | Unit: atomicmassunit (non-SI units allowed with the 8th edition of the SI)|
+|PTB149 | BRONZE | Unit: barn (non-SI units allowed with the 8th edition of the SI)|
+|PTB150 | BRONZE | Unit: clight (non-SI units allowed with the 8th edition of the SI)|
+|PTB151 | BRONZE | Unit: electronmass (non-SI units allowed with the 8th edition of the SI)|
+|PTB152 | BRONZE | Unit: elementarycharge (non-SI units allowed with the 8th edition of the SI)|
+|PTB153 | BRONZE | Unit: knot (non-SI units allowed with the 8th edition of the SI)|
+|PTB154 | BRONZE | Unit: naturalunittime (non-SI units allowed with the 8th edition of the SI)|
+|PTB155 | BRONZE | Unit: nauticalmile (non-SI units allowed with the 8th edition of the SI)|
+|PTB156 | BRONZE | Unit: hartree (non-SI units allowed with the 8th edition of the SI)|
+|PTB157 | BRONZE | Unit: bohr (non-SI units allowed with the 8th edition of the SI)|
+|PTB158 | BRONZE | Unit: planckbar (non-SI units allowed with the 8th edition of the SI)|
+|PTB159 | IMPROVABLE | Unit: planckbar (newline not allowed)|
+|PTB160 | IMPROVABLE | Unit: planckbar (tab not allowed)|
+|PTB161 | IMPROVABLE | Unit: planckbar (carriage return not allowed)|
+|PTB162 | IMPROVABLE | Unit: planckbar (null not allowed)|
+|PTB163 | PLATINUM | Units: metre (SI base unit), m0 (SI base unit with exponent)|
+|PTB164 | PLATINUM | Units: metre (SI base unit), m m-1 (SI base unit with exponent)|
+|PTB165 | PLATINUM | Units: metre (SI base unit), m-1 m (SI base unit with exponent)|
+|PTB166 | PLATINUM | Units: metre (SI base unit), degree (extended SI base unit)|"
+|PTB167 | PLATINUM | Units: metre (SI base unit), arcminute (extended SI base unit)|
+|PTB168 | PLATINUM | Units: metre (SI base unit), arcsecond (extended SI base unit)|
+|PTB169 | PLATINUM | Units: metre (SI base unit), \degree\tothe{1} (extended SI base unit with exponent)|
+|PTB170 | PLATINUM | Units: metre (SI base unit), \arcminute\tothe{1} (extended SI base unit with exponent)|
+|PTB171 | PLATINUM | Units: metre (SI base unit), \arcsecond\tothe{1} (extended SI base unit with exponent)|
+|PTB172 | GOLD | Units: metre (SI base unit), radian (derived SI unit)|
+|PTB173 | GOLD | Units: metre (SI base unit), microradian (derived SI unit with prefix)|
+|PTB174 | GOLD | Units: metre (SI base unit), rad-1 (derived SI unit with exponent)|
+|PTB175 | GOLD | Units: metre (SI base unit), mrad-1 (derived SI unit with prefix and exponent)|
+|PTB176 | IMPROVABLE | Units: metre (SI base unit),unit phase is empty|
+|PTB177 | IMPROVABLE | Units: metre (SI base unit), radian radian (used for phase not allowed)|
+|PTB178 | IMPROVABLE | Units: metre (SI base unit), gram (used for phase not allowed)|
+|PTB179 | IMPROVABLE | Units: metre (SI base unit), metre (used for phase not allowed)|
+|PTB180 | IMPROVABLE | Units: m (SI base unit), m3 (used for phase not allowed)|
+|PTB181 | IMPROVABLE | Units: metre (SI base unit), metre metre (used for phase not allowed)|
+|PTB182 | IMPROVABLE | Units: metre (SI base unit), nanodegree (used for phase not allowed)|
+|PTB183 | IMPROVABLE | Units: metre (SI base unit), microarcminute (used for phase not allowed)|
+|PTB184 | IMPROVABLE | Units: metre (SI base unit), centiarcsecond (used for phase not allowed)|
+|PTB185 | PLATINUM | correct real|
+|PTB186 | PLATINUM | correct complex|
+|PTB187 | PLATINUM | valid si:value |
+|PTB188 | PLATINUM | valid expanded uncertainty |
+|PTB189 | PLATINUM | valid expanded uncertainty |
+|PTB190 | PLATINUM | valid expanded uncertainty |
+|PTB191 | PLATINUM | valid expanded uncertainty |
+|PTB192 | PLATINUM | valid expanded uncertainty |
+|PTB193 | IMPROVABLE | invalid expanded uncertainty |
+|PTB194 | PLATINUM | valid expanded uncertainty |
+|PTB195 | IMPROVABLE | empty distribution |
+|PTB196 | IMPROVABLE | empty disribution |
+|PTB197 | IMPROVABLE | empty distribution |
+|PTB198 | IMPROVABLE | invalid coverage value |
+|PTB199 | IMPROVABLE | invalid coverage value|
+|PTB200 | IMPROVABLE | invalid coverage value|
+|PTB201 | IMPROVABLE | invalid coverage value|
+|PTB202 | IMPROVABLE | invalid coverage value|
+|PTB203 | IMPROVABLE | invalid coverage value|
+|PTB204 | IMPROVABLE | missing mandatory component|
+|PTB205 | IMPROVABLE | missing mandatory component|
+|PTB206 | IMPROVABLE | missing mandatory component|
+|PTB207 | IMPROVABLE | missing mandatory component|
+|PTB208 | IMPROVABLE | missing mandatory component|
+|PTB209 | IMPROVABLE | missing mandatory component|
+|PTB210 | IMPROVABLE | missing mandatory component|
+|PTB211 | IMPROVABLE | invalid negative standard uncertainty |
+|PTB212 | PLATINUM | valid standard uncertainty |
+|PTB213 | PLATINUM | zero standard uncertainty |
+|PTB214 | IMPROVABLE | invalid -0 uncertainty value |
+|PTB215 | PLATINUM | correct interval boundaries |
+|PTB216 | IMPROVABLE | invalid interval boundaries |
+|PTB217 | PLATINUM | valid interval boundaries |
+|PTB218 | PLATINUM | valid interval boundaries |
+|PTB219 | IMPROVABLE | invalid distribution |
+|PTB220 | PLATINUM | valid distribution |
+|PTB221 | PLATINUM | valid coverage factor |
+|PTB222 | PLATINUM | coverage factor one|
+|PTB223 | IMPROVABLE | coverage factor smaller than one|
+|PTB224 | PLATINUM | valid coverage probability 1|
+|PTB225 | PLATINUM | valid coverage probability 0|
+|PTB226 | IMPROVABLE | invalid coverage probability > 1|
+|PTB227 | IMPROVABLE | invalid coverage probability < 0|
+|PTB228 | PLATINUM | valid uncertainty value |
+|PTB229 | PLATINUM | valid uncertainty value 0|
+|PTB230 | IMPROVABLE | invalid uncertainty value |
+|PTB231 | IMPROVABLE | invalid uncertainty value |
+|PTB232 | IMPROVABLE | invalid distribution |
+|PTB233 | IMPROVABLE | invalid unit |
+|PTB234 | IMPROVABLE | negative value on covariance matrix main diagonal |
+|PTB235 | PLATINUM | list with Platinum class |
+|PTB236 | GOLD | list of real with GOLD unit |
+|PTB237 | SILVER | list of real with SILVER unit |
+|PTB238 | BRONZE | listof real with BRONZE unit |
+|PTB239 | IMPROVABLE | list of real with IMPROVABLE unit |
+|PTB240 | PLATINUM | list of real with PLATINUM unit |
+|PTB241 | GOLD | list of real with local GOLD unit |
+|PTB242 | SILVER | list of real with local SILVER unit |
+|PTB243 | BRONZE | list of real with local BRONZE unit |
+|PTB244 | IMPROVABLE | list of real with local IMPROVABLE unit |
+|PTB245 | IMPROVABLE | list with empty distribution in uncertainty |
+|PTB246 | PLATINUM | list with correct list univariate uncertainty|
+|PTB247 | IMPROVABLE | list with empty distribution in region|
+|PTB248 | IMPROVABLE | list of real with forbidden bivariate uncertainty |
+|PTB249 | IMPROVABLE | list of real with wrong dimension of region metadata |
+|PTB250 | IMPROVABLE | listof real with wrong covariance units in region |
+|PTB251 | IMPROVABLE | list of real with non-symmetric covariance |
+|PTB252 | IMPROVABLE | listof real with invalid correltation values for covariance |
+|PTB253 | IMPROVABLE | list of real with illegal mix of region and univariate uncertainty |
+|PTB254 | IMPROVABLE | list univaraite uncertainty needs more than one real in list |
+|PTB255 | IMPROVABLE | list univaraite uncertainty needs more than one real in list |
+|PTB256 | IMPROVABLE | list univariate uncertainty without list unit |
+|PTB257 | IMPROVABLE | region requires more than one real in the list |
+|PTB258 | IMPROVABLE | region requires more than one real in the list |
+|PTB259 | IMPROVABLE | list unit needs more than one real in list |
+|PTB260 | IMPROVABLE | list unit needs more than one real in list |
+|PTB261 | IMPROVABLE | list unit without real form |
+|PTB262 | IMPROVABLE | wrong local real fromat in list |
+|PTB263 | IMPROVABLE | wrong local real fromat in list |
+|PTB264 | IMPROVABLE | illegal mix of local and list unit |
+|PTB265 | IMPROVABLE | illegal mix of local and list univaraite uncertainty |
+|PTB266 | IMPROVABLE | illegal uncertainty in list univariate uncertainty |
+|PTB267 | IMPROVABLE | illegal uncertainty in list univariate uncertainty |
+|PTB268 | IMPROVABLE | illegal coverage factor in list uncertainty |
+|PTB269 | IMPROVABLE | illegal interval boundaries in list uncertainty |
+|PTB270 | IMPROVABLE | illegal interval boundaries in list uncertainty |
+|PTB271 | PLATINUM | identic interval boundaries in list uncertainty |
+|PTB272 | IMPROVABLE | illegal coverage probability in list uncertainty |
+|PTB273 | IMPROVABLE | illegal coverage probability in list uncertainty |
+|PTB274 | GOLD | hybrid GOLD unit classification |
+|PTB275 | IMPROVABLE | real list with empty unit |
+|PTB276 | IMPROVABLE | empty hybrid element |
+|PTB277 | IMPROVABLE | empty list of real |
+|PTB278 | IMPROVABLE | no constants allowed in list |
+|PTB279 | IMPROVABLE | list: forbidden mix of real and realList |
+|PTB280 | IMPROVABLE | list unit forbidden to be used with list of realList elements |
+|PTB281 | IMPROVABLE | list unit phase not allowed |
+|PTB282 | IMPROVABLE | empty sub lists |
+|PTB283 | IMPROVABLE | forbidden univariate uncertainty |
+|PTB284 | IMPROVABLE | illegal bivaraite uncertainty |
+|PTB285 | IMPROVABLE | illegal region uncertainty |
+|PTB286 | IMPROVABLE | IMPROVABLE unit in sub list |
+|PTB287 | PLATINUM | PLATINUM unit in sub list |
+|PTB288 | BRONZE | BRONZE unit in sub list |
+|PTB500 | PLATINUM | Cartesian complex of class PLATINUM |
+|PTB501 | PLATINUM | Polar complex form of calss PLATINUM |
+|PTB502 | IMPROVABLE | missing unit phase |
+|PTB503 | IMPROVABLE | invalid complex |
+|PTB504 | IMPROVABLE | invalid complex |
+|PTB505 | IMPROVABLE | invalid complex |
+|PTB506 | IMPROVABLE | invalid complex |
+|PTB507 | IMPROVABLE | invalid complex |
+|PTB508 | IMPROVABLE | invalid complex |
+|PTB509 | IMPROVABLE | incomplete Cartesian complex form |
+|PTB510 | IMPROVABLE | incomplete Cartesian complex form |
+|PTB511 | IMPROVABLE | incomplete Cartesian complex form |
+|PTB512 | IMPROVABLE | incomplete Cartesian complex form |
+|PTB513 | IMPROVABLE | incomplete Cartesian complex form |
+|PTB514 | IMPROVABLE | incomplete Cartesian complex form |
+|PTB515 | IMPROVABLE | incomplete polar complex form |
+|PTB516 | IMPROVABLE | incomplete polar complex form |
+|PTB517 | IMPROVABLE | incomplete polar complex form |
+|PTB518 | IMPROVABLE | incomplete polar complex form |
+|PTB519 | IMPROVABLE | incomplete polar complex form |
+|PTB520 | IMPROVABLE | incomplete polar complex form |
+|PTB521 | PLATINUM | correct region |
+|PTB522 | IMPROVABLE | illegal negative values in main diagonal of covariance |
+|PTB523 | IMPROVABLE | illegal negative values in main diagonal of covariance |
+|PTB524 | GOLD | correct region with GOLD class |
+|PTB525 | IMPROVABLE | illegal negative values in main diagonal of covariance|
+|PTB526 | IMPROVABLE | illegal negative values in main diagonal of covariance|
+|PTB527 | PLATINUM | correct region |
+|PTB528 | GOLD | correct region with GOLD medal |
+|PTB529 | IMPROVABLE | illegal coverage factor |
+|PTB530 | IMPROVABLE | illegal coverage probability |
+|PTB531 | PLATINUM | PLATINUM unit |
+|PTB532 | GOLD | GOLD unit |
+|PTB533 | SILVER | SILVER unit |
+|PTB534 | BRONZE | BRONZE unit |
+|PTB535 | IMPROVABLE | IMPROABLE unit |
+|PTB536 | PLATINUM | PLATINUM unit phase |
+|PTB537 | GOLD | GOLD unit phase |
+|PTB538 | IMPROVABLE | IMPROVABLE unit phase|
+|PTB539 | PLATINUM | correct uncertainty |
+|PTB540 | IMPROVABLE | illegal distribution |
+|PTB541 | IMPROVABLE | illegal 2x2 covariance matrix |
+|PTB542 | IMPROVABLE | illegal covariance unit |
+|PTB543 | IMPROVABLE | illegal covariance unit |
+|PTB544 | IMPROVABLE | non symmetric covariance matrix|
+|PTB545 | IMPROVABLE | illegal correlation values for covariance matrix |
+|PTB546 | IMPROVABLE | illegal negative main diagonal values in covariance |
+|PTB547 | IMPROVABLE | illegal negative main diagonal values in covariance |
+|PTB548 | GOLD | complex list with GOLD unit |
+|PTB549 | GOLD | complex list with GOLD unit |
+|PTB550 | GOLD | complex list with GOLD unit |
+|PTB551 | GOLD | complex list with GOLD unit |
+|PTB552 | PLATINUM | complex list with PLATINUM unit |
+|PTB553 | PLATINUM | complex list with PLATINUM unit |
+|PTB554 | IMPROVABLE | empty distribution in bivaraite uncertainty |
+|PTB555 | PLATINUM | correct bivariate uncertainty |
+|PTB556 | IMPROVABLE | univariate uncertainty illegal in complex list |
+|PTB557 | IMPROVABLE | wrong dimension of bivariate uncertainty |
+|PTB558 | IMPROVABLE | wrong dimension of region |
+|PTB559 | IMPROVABLE | wrong unit of covaraince in bivariate uncertainty |
+|PTB560 | IMPROVABLE | wrong unit of covariance in region |
+|PTB561 | IMPROVABLE | non symmetric covaraince in bivaraite region |
+|PTB562 | IMPROVABLE | non symmetric covariance in region |
+|PTB563 | IMPROVABLE | illegal mix of bivariate uncertainty and region |
+|PTB564 | IMPROVABLE | list uncertainty needs more than one complex element |
+|PTB565 | IMPROVABLE | list uncertainty needs more than one complex element |
+|PTB567 | IMPROVABLE | missing list unit for bivariate uncertainty |
+|PTB568 | IMPROVABLE | missing list unit for bivariate uncertainty |
+|PTB569 | IMPROVABLE | region needs more than one complex element |
+|PTB570 | IMPROVABLE | region needs more than one complex element |
+|PTB571 | IMPROVABLE | illegal mix of local and list uncertainty |
+|PTB572 | IMPROVABLE | illegal mix of local and list uncertainty |
+|PTB573 | IMPROVABLE | illegal empty list |
+|PTB574 | IMPROVABLE | list unit needs more than one complex element |
+|PTB575 | IMPROVABLE | list unit phase without polar form |
+|PTB576 | IMPROVABLE | list unit phase without list unit |
+|PTB577 | IMPROVABLE | illegal mix of local units and list units |
+|PTB578 | IMPROVABLE | illegal mix of local uncertainty and list uncertainty |
+|PTB579 | IMPROVABLE | invalid local complex form |
+|PTB580 | IMPROVABLE | illegal mix of local units and list units |
+|PTB581 | IMPROVABLE | illegal covariance matrix |
+|PTB582 | IMPROVABLE | illegal covariance matrix |
+|PTB583 | IMPROVABLE | illegal covariance matrix |
+|PTB584 | IMPROVABLE | illegal covariance matrix |
+|PTB585 | IMPROVABLE | illegal covariance matrix |
+|PTB586 | IMPROVABLE | illegal covariance matrix |
+|PTB587 | IMPROVABLE | illegal covariance matrix |
+|PTB588 | IMPROVABLE | illegal covariance matrix |
+|PTB589 | IMPROVABLE | illegal covariance matrix |
+|PTB590 | IMPROVABLE | illegal covariance matrix |
+|PTB591 | IMPROVABLE | illegal covariance matrix |
+|PTB592 | PLATINUM | valid covariacne matrix |
+|PTB593 | PLATINUM | valid data |
+|PTB594 | IMPROVABLE | illegal covariance matrix dimension |
+|PTB595 | IMPROVABLE | illegal covariance matrix dimension |
+|PTB596 | IMPROVABLE | illegal covariance matrix dimension |
+|PTB597 | IMPROVABLE | illegal covariance matrix unit |
+|PTB598 | PLATINUM | valid covariance matrix dimension |
+|PTB599 | IMPROVABLE | illegal covariance matrix dimension |
+|PTB600 | IMPROVABLE | illegal covariance matrix dimension |
+|PTB601 | PLATINUM | valid covariance matrix dimension |
+|PTB602 | IMPROVABLE | illegal covariance matrix dimension |
+|PTB603 | IMPROVABLE | illegal covariance matrix dimension |
+|PTB604 | PLATINUM | valid covariance matrix dimension |
+|PTB605 | IMPROVABLE | illegal covariance matrix dimension |
+|PTB606 | IMPROVABLE | illegal covariance matrix dimension |
+|PTB607 | PLATINUM | valid covariance matrix correlation |
+|PTB608 | GOLD | valid covariance matrix correlation |
+|PTB609 | PLATINUM | valid covariance matrix correlation |
+|PTB610 | IMPROVABLE | invalid covariance matrix correlation |
+|PTB611 | PLATINUM | valid covariance matrix correlation |
+|PTB612 | IMPROVABLE | invalid covariance matrix correlation |
+|PTB613 | GOLD | valid covariance matrix correlation |
+|PTB614 | IMPROVABLE | covaraince matrix with negative main diagonal value |
+|PTB615 | PLATINUM | covaraince matrix with correct main diagonal value |
+|PTB616 | IMPROVABLE | covaraince matrix with negative main diagonal value |
+|PTB617 | PLATINUM | covaraince matrix with correct main diagonal value |
+|PTB618 | PLATINUM | covaraince matrix with correct main diagonal value |
+|PTB619 | IMPROVABLE | covaraince matrix with negative main diagonal value |
+|PTB620 | PLATINUM | covariance matrix is symmetric |
+|PTB621 | IMPROVABLE | covariance matrix not symmetric |
+|PTB622 | PLATINUM | covariance matrix is symmetric |
+|PTB623 | IMPROVABLE | covariance matrix not symmetric |
+|PTB624 | GOLD | symmetric covaraince matrix with GOLD unit |
+|PTB625 | IMPROVABLE | covariance matrix not symmetric |
+|PTB626 | IMPROVABLE | invalid unit in covariance |
+|PTB999 | BRONZE | list with BRONZE class |
+
+
+
+## 2. UM examples
+
+See Excel file [D-SI-Validation-Concept-Tests_SmartCom.xlsx](D-SI-Validation-Concept-Tests_SmartCom.xlsx)
+
+---
+
+[**Back to Home**](wiki/d-si-online-guide.md)
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
+
diff --git a/examples/GOLD/2020-03-20-UM-GOLD-examples.xml b/examples/GOLD/2020-03-20-UM-GOLD-examples.xml
index 9de46402dee297bb48daf934ae3468bffb5383de..ea6374f7553c3759c83379f6063c0e6165fa9d3e 100644
--- a/examples/GOLD/2020-03-20-UM-GOLD-examples.xml
+++ b/examples/GOLD/2020-03-20-UM-GOLD-examples.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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 for SmartCom D-SI data with quality class GOLD (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class GOLD (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="UM4">
@@ -54,7 +75,7 @@
</siTest:testData>
<siTest:testData id="UM17">
- <si:list>
+ <si:realList>
<si:listUnit>\siemens</si:listUnit>
<si:listUnivariateUnc>
<si:expandedUnc>
@@ -76,11 +97,11 @@
<si:real>
<si:value>195.1003</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="UM22">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueMagnitude>43.250</si:valueMagnitude>
<si:valuePhase>1.50</si:valuePhase>
@@ -93,12 +114,12 @@
<si:unit>\joule</si:unit>
<si:unitPhase>\radian</si:unitPhase>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="UM27">
<si:list>
- <si:list>
+ <si:realList>
<si:real>
<si:value>12.24</si:value>
<si:unit>\hour</si:unit>
@@ -107,8 +128,8 @@
<si:value>8.32</si:value>
<si:unit>\hour</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:value>4.34</si:value>
<si:unit>\minute</si:unit>
@@ -117,8 +138,8 @@
<si:value>5.34</si:value>
<si:unit>\minute</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:value>100.368</si:value>
<si:unit>\gram</si:unit>
@@ -127,7 +148,7 @@
<si:value>85.341</si:value>
<si:unit>\gram</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</siTest:testData>
@@ -322,7 +343,7 @@
<siTest:testData id="UM41">
<si:hybrid>
<!-- A: quantity from B converted to SI -->
- <si:list>
+ <si:realList>
<si:real>
<si:value>0.0045469</si:value>
<si:unit>\metre\tothe{3}</si:unit>
@@ -331,9 +352,9 @@
<si:value>0.02834959</si:value>
<si:unit>\kilogram</si:unit>
</si:real>
- </si:list>
+ </si:realList>
<!-- B: quantity with non-SI unit -->
- <si:list>
+ <si:realList>
<si:real>
<si:value>1</si:value>
<si:unit>imperial gallon</si:unit>
@@ -342,13 +363,13 @@
<si:value>1</si:value>
<si:unit>ounce</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:hybrid>
</siTest:testData>
<siTest:testData id="UM42">
<si:hybrid>
- <si:list>
+ <si:realList>
<!-- A: quantity from B converted to SI -->
<si:real>
<si:value>0.02834959</si:value>
@@ -359,8 +380,8 @@
<si:value>3600000</si:value>
<si:unit>\joule</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<!-- B: quantity with non-SI unit -->
<si:real>
<si:value>1</si:value>
@@ -371,13 +392,13 @@
<si:value>1</si:value>
<si:unit>kilowatt hour</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:hybrid>
</siTest:testData>
<siTest:testData id="UM43">
<si:hybrid>
- <si:list>
+ <si:realList>
<!-- A: quantity from B converted to SI -->
<si:real>
<si:value>3600000</si:value>
@@ -394,8 +415,8 @@
<si:unit>\metre\tothe{3}</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<!-- B: quantity with non-SI unit -->
<si:real>
<si:value>1</si:value>
@@ -411,13 +432,13 @@
<si:value>1</si:value>
<si:unit>imperial gallon</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:hybrid>
</siTest:testData>
<siTest:testData id="UM46">
<si:hybrid>
- <si:list>
+ <si:complexList>
<!-- A: quantity from B converted to SI -->
<si:complex>
<si:label>volume</si:label>
@@ -433,8 +454,8 @@
<si:valueImag>5.1497695284288</si:valueImag>
<si:unit>\metre\second\tothe{-1}</si:unit>
</si:complex>
- </si:list>
- <si:list>
+ </si:complexList>
+ <si:complexList>
<!-- B: quantity with non-SI unit -->
<si:complex>
<si:label>volume</si:label>
@@ -450,13 +471,13 @@
<si:valueImag>10.010352</si:valueImag>
<si:unit>\knot</si:unit>
</si:complex>
- </si:list>
+ </si:complexList>
</si:hybrid>
</siTest:testData>
<siTest:testData id="UM47">
<si:hybrid>
- <si:list>
+ <si:complexList>
<!-- A: quantity from B converted to SI -->
<si:complex>
<si:label>speed</si:label>
@@ -497,8 +518,8 @@
<si:distribution>normal-bivariate</si:distribution>
</si:ellipsoidalRegion>
</si:complex>
- </si:list>
- <si:list>
+ </si:complexList>
+ <si:complexList>
<!-- B: quantity with non-SI unit -->
<si:complex>
<si:label>speed</si:label>
@@ -539,13 +560,13 @@
<si:distribution>normal-bivariate</si:distribution>
</si:ellipsoidalRegion>
</si:complex>
- </si:list>
+ </si:complexList>
</si:hybrid>
</siTest:testData>
<siTest:testData id="UM48">
<si:hybrid>
- <si:list>
+ <si:complexList>
<!-- A: quantity from B converted to SI -->
<si:complex>
<si:valueReal>1495285974</si:valueReal>
@@ -595,8 +616,8 @@
<si:unitPhase>\arcminute</si:unitPhase>
</si:complex>
- </si:list>
- <si:list>
+ </si:complexList>
+ <si:complexList>
<!-- B: quantity with non-SI unit -->
<si:complex>
<si:valueReal>415.357215</si:valueReal>
@@ -645,13 +666,13 @@
<si:unit>\barel of oil</si:unit>
<si:unitPhase>\arcminute</si:unitPhase>
</si:complex>
- </si:list>
+ </si:complexList>
</si:hybrid>
</siTest:testData>
<siTest:testData id="UM49">
<si:hybrid>
- <si:list>
+ <si:complexList>
<!-- A: quantity from B converted to SI -->
<si:complex>
<si:label>pressure</si:label>
@@ -667,8 +688,8 @@
<si:unit>\metre\tothe{3}</si:unit>
<si:unitPhase>\arcminute</si:unitPhase>
</si:complex>
- </si:list>
- <si:list>
+ </si:complexList>
+ <si:complexList>
<!-- B: quantity with non-SI unit -->
<si:complex>
<si:label>pressure</si:label>
@@ -684,7 +705,7 @@
<si:unit>\barel of oil</si:unit>
<si:unitPhase>\arcminute</si:unitPhase>
</si:complex>
- </si:list>
+ </si:complexList>
</si:hybrid>
</siTest:testData>
@@ -692,7 +713,7 @@
<si:hybrid>
<si:list>
- <si:list>
+ <si:realList>
<!-- A: quantity from B converted to SI -->
<si:real>
<si:value>0.0045469</si:value>
@@ -704,8 +725,8 @@
<si:unit>\kilogram</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<!-- A: quantity from B converted to SI -->
<si:real>
<si:value>0.02834959</si:value>
@@ -717,11 +738,11 @@
<si:unit>\metre\tothe{2}\kilogram\second\tothe{-2}</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
<si:list>
- <si:list>
+ <si:realList>
<!-- B: quantity with non-SI unit -->
<si:real>
<si:value>1</si:value>
@@ -732,8 +753,8 @@
<si:value>1</si:value>
<si:unit>ounce</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<!-- B: quantity with non-SI unit -->
<si:real>
<si:value>1</si:value>
@@ -744,7 +765,7 @@
<si:value>1</si:value>
<si:unit>kilowatt hour</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</si:hybrid>
@@ -755,7 +776,7 @@
<si:list>
- <si:list>
+ <si:realList>
<!-- A: quantity from B converted to SI -->
<si:real>
<si:value>0.02834959</si:value>
@@ -771,9 +792,9 @@
<si:value>0.0045469</si:value>
<si:unit>\metre\tothe{3}</si:unit>
</si:real>
- </si:list>
+ </si:realList>
- <si:list>
+ <si:realList>
<!-- A: quantity from B converted to SI -->
<si:real>
<si:value>3600000</si:value>
@@ -785,11 +806,11 @@
<si:unit>\pascal</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
<si:list>
- <si:list>
+ <si:realList>
<!-- B: quantity with non-SI unit -->
<si:real>
<si:value>1</si:value>
@@ -805,8 +826,8 @@
<si:value>1</si:value>
<si:unit>imperial gallon</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<!-- B: quantity with non-SI unit -->
<si:real>
<si:value>1</si:value>
@@ -817,7 +838,7 @@
<si:value>1</si:value>
<si:unit>milimetre of mercury, conventional</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</si:hybrid>
@@ -828,7 +849,7 @@
<si:list>
- <si:list>
+ <si:realList>
<!-- A: quantity from B converted to SI -->
<si:real>
<si:value>3600000</si:value>
@@ -839,26 +860,26 @@
<si:value>133.322337415</si:value>
<si:unit>\pascal</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<!-- A: quantity from B converted to SI -->
<si:real>
<si:value>0.0045469</si:value>
<si:unit>\metre\tothe{3}</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<!-- A: quantity from B converted to SI -->
<si:real>
<si:value>0.5144444</si:value>
<si:unit>\metre\second\tothe{-1}</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
<si:list>
- <si:list>
+ <si:realList>
<!-- B: quantity with non-SI unit -->
<si:real>
<si:value>1</si:value>
@@ -869,24 +890,24 @@
<si:value>1</si:value>
<si:unit>milimetre of mercury, conventional</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<!-- B: quantity with non-SI unit -->
<si:real>
<si:value>1</si:value>
<si:unit>imperial gallon</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<!-- B: quantity with non-SI unit -->
<si:real>
<si:value>1</si:value>
<si:unit>knot</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</si:hybrid>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/GOLD/PTB-GOLD-examples-2.xml b/examples/GOLD/PTB-GOLD-examples-2.xml
index e5702a27598fccd73ba9c203054f346c19b16eeb..0746e1324b7125bcf95ebd12f74009d186cc1701 100644
--- a/examples/GOLD/PTB-GOLD-examples-2.xml
+++ b/examples/GOLD/PTB-GOLD-examples-2.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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 for SmartCom D-SI data with quality class GOLD (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class GOLD (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
@@ -101,7 +122,7 @@
<siTest:testData id="PTB548">
- <si:list>
+ <si:complexList>
<si:listUnit>\newton</si:listUnit>
<si:complex>
<si:valueReal>1.0</si:valueReal>
@@ -111,11 +132,11 @@
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB549">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
@@ -126,11 +147,11 @@
<si:valueImag>2.0</si:valueImag>
<si:unit>\metre</si:unit>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB550">
- <si:list>
+ <si:complexList>
<si:listUnit>\metre</si:listUnit>
<si:listUnitPhase>\radian</si:listUnitPhase>
<si:complex>
@@ -141,12 +162,12 @@
<si:valueMagnitude>1.0</si:valueMagnitude>
<si:valuePhase>1.0</si:valuePhase>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB551">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueMagnitude>1.0</si:valueMagnitude>
<si:valuePhase>1.0</si:valuePhase>
@@ -158,7 +179,7 @@
<si:valueImag>2.0</si:valueImag>
<si:unit>\metre</si:unit>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB608">
@@ -197,7 +218,7 @@
<siTest:testData id="PTB613">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
@@ -294,12 +315,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB624">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueMagnitude>1.0</si:valueMagnitude>
<si:valuePhase>1.0</si:valuePhase>
@@ -391,7 +412,7 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:complexList>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/GOLD/PTB-GOLD-examples.xml b/examples/GOLD/PTB-GOLD-examples.xml
index 48599d47f826f1079d4dbe3efc4c3e61a989cdd7..2d0a2a10a416906016540244eae43daacdb22e7f 100644
--- a/examples/GOLD/PTB-GOLD-examples.xml
+++ b/examples/GOLD/PTB-GOLD-examples.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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 for SmartCom D-SI data with quality class GOLD (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class GOLD (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB7">
@@ -396,7 +417,7 @@
</siTest:testData>
<siTest:testData id="PTB236">
- <si:list>
+ <si:realList>
<si:listUnit>\newton</si:listUnit>
<si:real>
<si:value>1.0</si:value>
@@ -404,11 +425,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB241">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\newton</si:unit>
@@ -417,7 +438,7 @@
<si:value>1.0</si:value>
<si:unit>\ampere</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB274">
@@ -429,4 +450,4 @@
</si:hybrid>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/GOLD/gold-test.xml b/examples/GOLD/gold-test.xml
index 4fb728ff86b7ddaedfede808ed52491d35d0107a..1c80b6ceaaed9ffe93d47d96e06950be17982fad 100644
--- a/examples/GOLD/gold-test.xml
+++ b/examples/GOLD/gold-test.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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>Examples of the D-SI XML implementation for testing of the gold quality class.</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class GOLD (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="GOLD-TEST-1">
@@ -17,4 +38,4 @@
</si:real>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml b/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml
index f29c023fcd43fb80c237dc9831eca793d1c13173..2c345f4c5d1e727bd669d2ba6c083ae1eda1fce9 100644
--- a/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml
+++ b/examples/IMPROVABLE/2020-03-20-UM-IMPROVABLE-examples.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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 for SmartCom D-SI data with quality class IMPROVABLE (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="UM2">
@@ -37,7 +58,7 @@
</siTest:testData>
<siTest:testData id="UM19">
- <si:list>
+ <si:realList>
<si:listUnit>\torr</si:listUnit>
<si:real>
<si:value>2.34</si:value>
@@ -48,11 +69,11 @@
<si:real>
<si:value>4.34</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="UM20">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:expandedUnc>
@@ -68,11 +89,11 @@
<si:real>
<si:value>333.34</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="UM25">
- <si:list>
+ <si:complexList>
<si:listUnit>\kelvin</si:listUnit>
<si:listBivariateUnc>
<si:ellipsoidalRegion>
@@ -111,12 +132,12 @@
<si:valueReal>10.510</si:valueReal>
<si:valueImag>5.510</si:valueImag>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="UM30">
<si:list>
- <si:list>
+ <si:realList>
<si:real>
<si:value>2.34</si:value>
<si:unit>\metre</si:unit>
@@ -125,8 +146,8 @@
<si:value>12.358</si:value>
<si:unit>\metre</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:value>4.34</si:value>
<si:unit>\second</si:unit>
@@ -134,7 +155,7 @@
<si:real>
<si:value>5.34</si:value>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</siTest:testData>
@@ -177,7 +198,7 @@
<siTest:testData id="UM44">
<si:hybrid>
- <si:list>
+ <si:realList>
<!-- A: quantity from B converted to SI -->
<si:real>
<si:value>133.322337415</si:value>
@@ -194,9 +215,9 @@
<si:unit>\kilogram</si:unit>
<si:label>mass value</si:label>
</si:real>
- </si:list>
+ </si:realList>
- <si:list>
+ <si:realList>
<!-- B: quantity with non-SI unit -->
<si:real>
<si:value>1</si:value>
@@ -212,14 +233,14 @@
<si:value>1</si:value>
<si:unit>ounce</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:hybrid>
</siTest:testData>
<siTest:testData id="UM45">
<si:hybrid>
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<!-- A: quantity from B converted to SI -->
<si:real>
@@ -236,9 +257,9 @@
<si:value>0.02834959</si:value>
<si:unit>\kilogram</si:unit>
</si:real>
- </si:list>
+ </si:realList>
- <si:list>
+ <si:realList>
<!-- B: quantity with non-SI unit -->
<si:real>
<si:value>1</si:value>
@@ -254,14 +275,14 @@
<si:value>1</si:value>
<si:unit>ounce</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:hybrid>
</siTest:testData>
<siTest:testData id="UM50">
<si:hybrid>
- <si:list>
+ <si:complexList>
<!-- A: quantity from B converted to SI -->
<si:complex>
<si:label>electric charge</si:label>
@@ -278,8 +299,8 @@
<si:unitPhase>\radian</si:unitPhase>
</si:complex>
- </si:list>
- <si:list>
+ </si:complexList>
+ <si:complexList>
<!-- B: quantity with non-SI unit -->
<si:complex>
<si:label>electric charge</si:label>
@@ -295,7 +316,7 @@
<si:valueImag>10.010352</si:valueImag>
<si:unit>\knot</si:unit>
</si:complex>
- </si:list>
+ </si:complexList>
</si:hybrid>
</siTest:testData>
@@ -303,7 +324,7 @@
<si:hybrid>
<si:list>
- <si:list>
+ <si:realList>
<!-- A: quantity from B converted to SI -->
<si:real>
<si:value>133.322337415</si:value>
@@ -314,9 +335,9 @@
<si:value>0.02834959</si:value>
<si:unit>\kilogram</si:unit>
</si:real>
- </si:list>
+ </si:realList>
- <si:list>
+ <si:realList>
<!-- A: quantity from B converted to SI -->
<si:real>
<si:value>0.5144444</si:value>
@@ -327,13 +348,13 @@
<si:value>0.0045469</si:value>
<si:unit>\metre\tothe{3}</si:unit>
</si:real>
- </si:list>
+ </si:realList>
- <si:list></si:list>
+ <si:realList></si:realList>
</si:list>
<si:list>
- <si:list>
+ <si:realList>
<!-- B: quantity with non-SI unit -->
<si:real>
<si:value>1</si:value>
@@ -344,9 +365,9 @@
<si:value>1</si:value>
<si:unit>imperial gallon</si:unit>
</si:real>
- </si:list>
+ </si:realList>
- <si:list>
+ <si:realList>
<!-- B: quantity with non-SI unit -->
<si:real>
<si:value>1</si:value>
@@ -357,9 +378,9 @@
<si:value>1</si:value>
<si:unit>knot</si:unit>
</si:real>
- </si:list>
+ </si:realList>
- <si:list>
+ <si:realList>
<!-- B: quantity with non-SI unit -->
<si:real>
<si:value>1</si:value>
@@ -370,14 +391,14 @@
<si:value>1</si:value>
<si:unit>kilowatt hour</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</si:hybrid>
</siTest:testData>
<siTest:testData id="UM55">
- <si:list>
+ <si:realList>
<si:hybrid>
<!-- A: quantity from B converted to SI -->
<si:real>
@@ -414,8 +435,8 @@
<si:unit>ounce</si:unit>
</si:real>
</si:hybrid>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:hybrid>
<!-- A: quantity from B converted to SI -->
<si:real>
@@ -452,8 +473,8 @@
<si:unit>imperial gallon</si:unit>
</si:real>
</si:hybrid>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:hybrid>
<!-- A: quantity from B converted to SI -->
<si:real>
@@ -490,11 +511,11 @@
<si:unit>ounce</si:unit>
</si:real>
</si:hybrid>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="UM56">
- <si:list>
+ <si:realList>
<si:real>
<si:label>volume</si:label>
<si:value>135.22100</si:value>
@@ -506,7 +527,7 @@
<si:distribution>normal</si:distribution>
</si:expandedUnc>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="UM57">
@@ -526,4 +547,4 @@
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml b/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml
index c0f0b1ed352f1b85999c8a099795b6a1eea69f99..9c613b816c4e6b85c3db8b650ca5457b7aaaf4e8 100644
--- a/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml
+++ b/examples/IMPROVABLE/PTB-IMPROVABLE-examples-2.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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 for SmartCom D-SI data with quality class IMPROVABLE (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB502">
@@ -596,7 +617,7 @@
<!-- region with complex list tests -->
<siTest:testData id="PTB546">
- <si:list>
+ <si:complexList>
<si:listUnit>\metre</si:listUnit>
<si:listBivariateUnc>
<si:ellipsoidalRegion>
@@ -634,12 +655,12 @@
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB547">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
@@ -728,12 +749,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:ellipsoidalRegion>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB554">
- <si:list>
+ <si:complexList>
<si:listUnit>\metre</si:listUnit>
<si:listUnitPhase>\radian</si:listUnitPhase>
<si:listBivariateUnc>
@@ -773,12 +794,12 @@
<si:valueMagnitude>1.0</si:valueMagnitude>
<si:valuePhase>2.0</si:valuePhase>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB556">
- <si:list>
+ <si:complexList>
<si:listUnivariateUnc>
<si:expandedUnc>
<si:uncertainty>0.1</si:uncertainty>
@@ -796,12 +817,12 @@
<si:valueImag>2.0</si:valueImag>
<si:unit>\metre</si:unit>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB557">
- <si:list>
+ <si:complexList>
<si:listUnit>\metre</si:listUnit>
<si:listBivariateUnc>
<si:ellipsoidalRegion>
@@ -829,12 +850,12 @@
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB558">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
@@ -919,12 +940,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:ellipsoidalRegion>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB559">
- <si:list>
+ <si:complexList>
<si:listUnit>\metre</si:listUnit>
<si:listBivariateUnc>
<si:ellipsoidalRegion>
@@ -962,12 +983,12 @@
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB560">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
@@ -1056,12 +1077,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:ellipsoidalRegion>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB561">
- <si:list>
+ <si:complexList>
<si:listUnit>\metre</si:listUnit>
<si:listBivariateUnc>
<si:ellipsoidalRegion>
@@ -1099,12 +1120,12 @@
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB562">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
@@ -1193,13 +1214,13 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:ellipsoidalRegion>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB563">
- <si:list>
- <si:listUnit>\metre</si:listUnit>
+ <si:complexList>
+ <si:listUnit>\metre</si:listUnit>
<si:listBivariateUnc>
<si:ellipsoidalRegion>
<si:covarianceMatrix>
@@ -1314,13 +1335,13 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:ellipsoidalRegion>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB564">
- <si:list>
- <si:listUnit>\metre</si:listUnit>
+ <si:complexList>
+ <si:listUnit>\metre</si:listUnit>
<si:listBivariateUnc>
<si:ellipsoidalRegion>
<si:covarianceMatrix>
@@ -1353,12 +1374,12 @@
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB565">
- <si:list>
+ <si:complexList>
<si:listUnit>\metre</si:listUnit>
<si:listBivariateUnc>
<si:ellipsoidalRegion>
@@ -1388,12 +1409,12 @@
<si:coverageProbability>0.95</si:coverageProbability>
</si:ellipsoidalRegion>
</si:listBivariateUnc>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB567">
- <si:list>
+ <si:complexList>
<si:listBivariateUnc>
<si:ellipsoidalRegion>
<si:covarianceMatrix>
@@ -1430,12 +1451,12 @@
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB568">
- <si:list>
+ <si:complexList>
<si:listUnitPhase>\metre</si:listUnitPhase>
<si:listBivariateUnc>
<si:ellipsoidalRegion>
@@ -1473,12 +1494,12 @@
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB569">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
@@ -1562,12 +1583,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:ellipsoidalRegion>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB570">
- <si:list>
+ <si:realList>
<si:ellipsoidalRegion>
<si:covarianceMatrix>
<si:column>
@@ -1646,12 +1667,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:ellipsoidalRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB571">
- <si:list>
+ <si:complexList>
<si:listUnit>\metre</si:listUnit>
<si:listBivariateUnc>
<si:ellipsoidalRegion>
@@ -1689,12 +1710,12 @@
<si:valueMagnitude>10.0</si:valueMagnitude>
<si:valuePhase>1.0</si:valuePhase>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB572">
- <si:list>
+ <si:complexList>
<si:listUnit>\metre</si:listUnit>
<si:listUnitPhase>\radian</si:listUnitPhase>
<si:listBivariateUnc>
@@ -1733,7 +1754,7 @@
<si:valueMagnitude>10.0</si:valueMagnitude>
<si:valuePhase>1.0</si:valuePhase>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
@@ -1744,17 +1765,17 @@
<siTest:testData id="PTB574">
- <si:list>
+ <si:complexList>
<si:listUnit>\metre</si:listUnit>
<si:complex>
<si:valueReal>10.0</si:valueReal>
<si:valueImag>1.0</si:valueImag>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB575">
- <si:list>
+ <si:complexList>
<si:listUnit>\metre</si:listUnit>
<si:listUnitPhase>\radian</si:listUnitPhase>
<si:complex>
@@ -1765,11 +1786,11 @@
<si:valueReal>10.0</si:valueReal>
<si:valueImag>1.0</si:valueImag>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB576">
- <si:list>
+ <si:complexList>
<si:listUnitPhase>\radian</si:listUnitPhase>
<si:complex>
<si:valueReal>10.0</si:valueReal>
@@ -1781,12 +1802,12 @@
<si:valueImag>1.0</si:valueImag>
<si:unit>\metre</si:unit>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB577">
- <si:list>
+ <si:complexList>
<si:listUnit>\metre</si:listUnit>
<si:listUnitPhase>\radian</si:listUnitPhase>
<si:complex>
@@ -1801,11 +1822,11 @@
<si:unit>\metre</si:unit>
<si:unitPhase>\radian</si:unitPhase>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB578">
- <si:list>
+ <si:complexList>
<si:listUnit>\metre</si:listUnit>
<si:listBivariateUnc>
<si:ellipsoidalRegion>
@@ -1869,12 +1890,12 @@
<si:valueMagnitude>10.0</si:valueMagnitude>
<si:valuePhase>1.0</si:valuePhase>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB579">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueImag>1.0</si:valueImag>
<si:unit>\metre</si:unit>
@@ -1884,12 +1905,12 @@
<si:valueImag>1.0</si:valueImag>
<si:unit>\metre</si:unit>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB580">
- <si:list>
+ <si:complexList>
<si:listUnit>\radian</si:listUnit>
<si:complex>
<si:valueReal>10.0</si:valueReal>
@@ -1901,7 +1922,7 @@
<si:valueImag>1.0</si:valueImag>
<si:unit>\metre</si:unit>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
@@ -2177,7 +2198,7 @@
<siTest:testData id="PTB594">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -2208,13 +2229,13 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB595">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -2253,11 +2274,11 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB596">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -2288,12 +2309,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB597">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -2327,12 +2348,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB599">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -2363,7 +2384,7 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
@@ -2409,7 +2430,7 @@
<siTest:testData id="PTB602">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -2500,12 +2521,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB603">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -2582,13 +2603,13 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB605">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueReal>1.0</si:valueReal>
<si:valueImag>1.0</si:valueImag>
@@ -2883,12 +2904,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB606">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueReal>1.0</si:valueReal>
<si:valueImag>1.0</si:valueImag>
@@ -3153,12 +3174,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB610">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\ampere</si:unit>
@@ -3253,7 +3274,7 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
@@ -3293,7 +3314,7 @@
<siTest:testData id="PTB614">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -3328,12 +3349,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB616">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -3368,12 +3389,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB619">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -3408,7 +3429,7 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
@@ -3447,7 +3468,7 @@
</siTest:testData>
<siTest:testData id="PTB623">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -3482,12 +3503,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB625">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueMagnitude>1.0</si:valueMagnitude>
<si:valuePhase>1.0</si:valuePhase>
@@ -3579,12 +3600,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB626">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\ampere</si:unit>
@@ -3631,11 +3652,11 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml b/examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml
index 249b923f6a726fb448562b07a726ce9c4a581b2d..403eef0f813aab1b2610a8bc01001c3894653f4d 100644
--- a/examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml
+++ b/examples/IMPROVABLE/PTB-IMPROVABLE-examples.xml
@@ -3,11 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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/.
+ -->
-<!-- https://ptb.de/si/examples https://ptb.de/si/examples/SI_Format_TestData.xsd -->
<siTest:metaData>
- <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB17">
@@ -839,7 +859,7 @@
</siTest:testData>
<siTest:testData id="PTB234">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:real>
<si:value>1.0</si:value>
@@ -873,11 +893,11 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:ellipsoidalRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB239">
- <si:list>
+ <si:realList>
<si:listUnit>feet</si:listUnit>
<si:real>
<si:value>1.0</si:value>
@@ -885,11 +905,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB244">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit></si:unit>
@@ -898,11 +918,11 @@
<si:value>1.0</si:value>
<si:unit>\ampere</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB245">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:expandedUnc>
@@ -918,11 +938,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB247">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:real>
<si:value>1.0</si:value>
@@ -957,11 +977,11 @@
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution> </si:distribution>
</si:ellipsoidalRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB248">
- <si:list>
+ <si:realList>
<si:listBivariateUnc>
</si:listBivariateUnc>
<si:real>
@@ -972,11 +992,11 @@
<si:value>1.0</si:value>
<si:unit>\ampere</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB249">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\kelvin</si:unit>
@@ -1007,11 +1027,11 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB250">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\kelvin</si:unit>
@@ -1046,11 +1066,11 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB251">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\kelvin</si:unit>
@@ -1085,11 +1105,11 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB252">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\kelvin</si:unit>
@@ -1124,11 +1144,11 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB253">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:coverageInterval>
@@ -1170,11 +1190,11 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB254">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:coverageInterval>
@@ -1187,11 +1207,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB255">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:coverageInterval>
@@ -1201,11 +1221,11 @@
<si:coverageProbability>0.9</si:coverageProbability>
</si:coverageInterval>
</si:listUnivariateUnc>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB256">
- <si:list>
+ <si:realList>
<si:listUnivariateUnc>
<si:expandedUnc>
<si:uncertainty>2.0</si:uncertainty>
@@ -1221,11 +1241,11 @@
<si:value>1.0</si:value>
<si:unit>\ampere</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB257">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\kelvin</si:unit>
@@ -1256,11 +1276,11 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB258">
- <si:list>
+ <si:realList>
<si:rectangularRegion>
<si:covarianceMatrix>
<si:column>
@@ -1287,37 +1307,37 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB259">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB260">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB261">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:real>
</si:real>
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB262">
- <si:list>
+ <si:realList>
<si:real>
<si:unit>\kelvin</si:unit>
</si:real>
@@ -1325,11 +1345,11 @@
<si:value>1.0</si:value>
<si:unit>\ampere</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB263">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
</si:real>
@@ -1337,11 +1357,11 @@
<si:value>1.0</si:value>
<si:unit>\ampere</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB264">
- <si:list>
+ <si:realList>
<si:listUnit>\radian</si:listUnit>
<si:real>
<si:value>1.0</si:value>
@@ -1351,11 +1371,11 @@
<si:value>1.0</si:value>
<si:unit>\ampere</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB265">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:expandedUnc>
@@ -1376,11 +1396,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB266">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:expandedUnc>
@@ -1395,11 +1415,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB267">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:coverageInterval>
@@ -1415,11 +1435,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB268">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:expandedUnc>
@@ -1434,11 +1454,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB269">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:coverageInterval>
@@ -1454,11 +1474,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB270">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:coverageInterval>
@@ -1474,11 +1494,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB272">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:expandedUnc>
@@ -1493,11 +1513,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB273">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:coverageInterval>
@@ -1513,7 +1533,7 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB275">
@@ -1531,8 +1551,8 @@
</siTest:testData>
<siTest:testData id="PTB277">
- <si:list>
- </si:list>
+ <si:realList>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB278">
@@ -1549,12 +1569,12 @@
<siTest:testData id="PTB279">
<si:list>
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.34</si:value>
<si:unit>\metre</si:unit>
</si:real>
- </si:list>
+ </si:realList>
<si:real>
<si:value>1.34</si:value>
<si:unit>\kelvin</si:unit>
@@ -1565,21 +1585,21 @@
<siTest:testData id="PTB280">
<si:list>
<si:listUnit>\metre</si:listUnit>
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</siTest:testData>
<siTest:testData id="PTB281">
- <si:list>
+ <si:complexList>
<si:listUnitPhase>\degree</si:listUnitPhase>
<si:list>
<si:complex>
@@ -1595,15 +1615,15 @@
<si:unit>\kelvin</si:unit>
</si:complex>
</si:list>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB282">
<si:list>
- <si:list>
- </si:list>
- <si:list>
- </si:list>
+ <si:realList>
+ </si:realList>
+ <si:complexList>
+ </si:complexList>
</si:list>
</siTest:testData>
@@ -1617,18 +1637,18 @@
<si:distribution>normal</si:distribution>
</si:expandedUnc>
</si:listUnivariateUnc>
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</siTest:testData>
@@ -1662,26 +1682,26 @@
<si:coverageProbability>0.95</si:coverageProbability>
</si:ellipsoidalRegion>
</si:listBivariateUnc>
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
<si:unit>\metre</si:unit>
</si:complex>
- </si:list>
- <si:list>
+ </si:complexList>
+ <si:complexList>
<si:complex>
<si:valueReal>1.0</si:valueReal>
<si:valueImag>2.0</si:valueImag>
<si:unit>\metre</si:unit>
</si:complex>
- </si:list>
+ </si:complexList>
</si:list>
</siTest:testData>
<siTest:testData id="PTB285">
<si:list>
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\kelvin</si:unit>
@@ -1690,8 +1710,8 @@
<si:value>1.0</si:value>
<si:unit>\ampere</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\kelvin</si:unit>
@@ -1700,7 +1720,7 @@
<si:value>1.0</si:value>
<si:unit>\ampere</si:unit>
</si:real>
- </si:list>
+ </si:realList>
<si:rectangularRegion>
<si:covarianceMatrix>
<si:column>
@@ -1732,19 +1752,19 @@
<siTest:testData id="PTB286">
<si:list>
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.34</si:value>
<si:unit>\metre</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:value>1.34</si:value>
<si:unit>\metre83576</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/IMPROVABLE/improvable-test.xml b/examples/IMPROVABLE/improvable-test.xml
index efe7ba9557077f9b74b84879d9da379b11a3833a..78475a6d4c672f594073deec9ed68ba73533504c 100644
--- a/examples/IMPROVABLE/improvable-test.xml
+++ b/examples/IMPROVABLE/improvable-test.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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>Examples of the D-SI XML implementation for testing of the improvable quality class.</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class IMPROVABLE (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="IMPROVABLE-TEST-1">
@@ -17,4 +38,4 @@
</si:real>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/NOT PASSED/UM58-D-SI-example.xml b/examples/NOT PASSED/UM58-D-SI-example.xml
index 19b6a8cb77c444227bafb58951fe39b8535a5c0d..f5769092227e5935b2687daf040e881cf2dbabf6 100644
--- a/examples/NOT PASSED/UM58-D-SI-example.xml
+++ b/examples/NOT PASSED/UM58-D-SI-example.xml
@@ -1,7 +1,29 @@
+<!--
+ 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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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:testData id="UM58">
<si:label>signal</si:label>
<si:valueReal>-315.665478</si:valueReal>
<si:valueImag>10.010352</si:valueImag>
<si:unit>\hertz</si:unit>
</si:complex>
-</siTest:testData>
\ No newline at end of file
+</siTest:testData>
diff --git a/examples/NOT PASSED/UM59-D-SI-example.xml b/examples/NOT PASSED/UM59-D-SI-example.xml
index 842fe3c67cfd2252bdbbca6ef8270ba7c4ed13b5..2d2cd557e518c19672790793b09ae4d22b1ffd26 100644
--- a/examples/NOT PASSED/UM59-D-SI-example.xml
+++ b/examples/NOT PASSED/UM59-D-SI-example.xml
@@ -1,3 +1,24 @@
+<!--
+ 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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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:testData id="UM59">
<si:constant>
<si:label>Electron mass</si:label>
@@ -7,4 +28,4 @@
<si:uncertainty>-1.2e-39</si:uncertainty>
<si:distribution>normal</si:distribution>
</si:constant>
-</siTest:testData>
\ No newline at end of file
+</siTest:testData>
diff --git a/examples/NOT PASSED/UM60-D-SI-example.xml b/examples/NOT PASSED/UM60-D-SI-example.xml
index 624fec43cb81c2393f1ba481d2dbccf052d10089..b824711ff9dad1f784dfb3070438dfc1592c4ab0 100644
--- a/examples/NOT PASSED/UM60-D-SI-example.xml
+++ b/examples/NOT PASSED/UM60-D-SI-example.xml
@@ -1,5 +1,26 @@
+<!--
+ 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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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:testData id="UM60">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:expandedUnc>
@@ -15,4 +36,4 @@
<si:real>
<si:value>333.34</si:value>
</si:real>
-</siTest:testData>
\ No newline at end of file
+</siTest:testData>
diff --git a/examples/PLATINUM/2020-03-20-UM-PLATINUM-examples.xml b/examples/PLATINUM/2020-03-20-UM-PLATINUM-examples.xml
index ba9ea770203ae7aa3ba14448d587f8a25768f286..2fdfae5ab91633eea8c9654d70efd5c80c6b66d4 100644
--- a/examples/PLATINUM/2020-03-20-UM-PLATINUM-examples.xml
+++ b/examples/PLATINUM/2020-03-20-UM-PLATINUM-examples.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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 for SmartCom D-SI data with quality class PLATINUM (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class PLATINUM (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="UM1">
@@ -48,7 +69,7 @@
</siTest:testData>
<siTest:testData id="UM16">
- <si:list>
+ <si:realList>
<si:real>
<si:value>243.0003</si:value>
<si:unit>\kilogram</si:unit>
@@ -61,11 +82,11 @@
<si:value>3.55</si:value>
<si:unit>\ampere</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="UM21">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueReal>10.310</si:valueReal>
<si:valueImag>5.010</si:valueImag>
@@ -81,12 +102,12 @@
<si:valueImag>5.510</si:valueImag>
<si:unit>\arcsecond</si:unit>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="UM26">
<si:list>
- <si:list>
+ <si:realList>
<si:real>
<si:value>112.333</si:value>
<si:unit>\hour</si:unit>
@@ -95,8 +116,8 @@
<si:value>54.120</si:value>
<si:unit>\hour</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:value>90.34</si:value>
<si:unit>\degree</si:unit>
@@ -105,8 +126,8 @@
<si:value>87.34</si:value>
<si:unit>\degree</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/PLATINUM/PTB-PLATINUM-examples-2.xml b/examples/PLATINUM/PTB-PLATINUM-examples-2.xml
index 5975c55e2a10c8c8db1f95668b4f52da102abea7..2947a2e1c9f80b3afd9f555204953b0032ea0de1 100644
--- a/examples/PLATINUM/PTB-PLATINUM-examples-2.xml
+++ b/examples/PLATINUM/PTB-PLATINUM-examples-2.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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 for SmartCom D-SI data with quality class PLATINUM (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class PLATINUM (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
@@ -157,7 +178,7 @@
<siTest:testData id="PTB552">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueMagnitude>1.0</si:valueMagnitude>
<si:valuePhase>1.0</si:valuePhase>
@@ -169,11 +190,11 @@
<si:valueImag>2.0</si:valueImag>
<si:unit>\metre</si:unit>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB553">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueMagnitude>1.0</si:valueMagnitude>
<si:valuePhase>1.0</si:valuePhase>
@@ -185,12 +206,12 @@
<si:valueImag>2.0</si:valueImag>
<si:unit>\metre</si:unit>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="PTB555">
- <si:list>
+ <si:complexList>
<si:listUnit>\metre</si:listUnit>
<si:listUnitPhase>\degree</si:listUnitPhase>
<si:listBivariateUnc>
@@ -230,7 +251,7 @@
<si:valueMagnitude>1.0</si:valueMagnitude>
<si:valuePhase>1.0</si:valuePhase>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
@@ -270,7 +291,7 @@
<siTest:testData id="PTB593">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -305,12 +326,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB598">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -345,13 +366,13 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB601">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -446,12 +467,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB604">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueReal>1.0</si:valueReal>
<si:valueImag>1.0</si:valueImag>
@@ -750,7 +771,7 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:complexList>
</siTest:testData>
@@ -859,7 +880,7 @@
<siTest:testData id="PTB615">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -894,13 +915,13 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB617">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -935,12 +956,12 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB618">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -975,7 +996,7 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
@@ -1015,7 +1036,7 @@
<siTest:testData id="PTB622">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\metre</si:unit>
@@ -1050,9 +1071,9 @@
<si:coverageFactor>1.5</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/PLATINUM/PTB-PLATINUM-examples.xml b/examples/PLATINUM/PTB-PLATINUM-examples.xml
index 5bf0438920b8959fe388557f5f5462d6f908a9e8..b7871a30253d32c5e4ba54c733b22efdabfc10d1 100644
--- a/examples/PLATINUM/PTB-PLATINUM-examples.xml
+++ b/examples/PLATINUM/PTB-PLATINUM-examples.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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 for SmartCom D-SI data with quality class PLATINUM (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class PLATINUM (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB1">
@@ -527,7 +548,7 @@
</siTest:testData>
<siTest:testData id="PTB235">
- <si:list>
+ <si:realList>
<si:listUnit>\candela</si:listUnit>
<si:real>
<si:value>1.0</si:value>
@@ -535,11 +556,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB240">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\kelvin</si:unit>
@@ -548,11 +569,11 @@
<si:value>1.0</si:value>
<si:unit>\ampere</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB246">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:expandedUnc>
@@ -568,11 +589,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB271">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:coverageInterval>
@@ -588,24 +609,24 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB287">
<si:list>
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.34</si:value>
<si:unit>\metre</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:value>1.34</si:value>
<si:unit>\kelvin</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/PLATINUM/platinum-test.xml b/examples/PLATINUM/platinum-test.xml
index ca30fe5e825602c1d608acd17cf8db148bbfe874..6478d6d6dc0aaa7dae36a31dc6b90b9532b4de85 100644
--- a/examples/PLATINUM/platinum-test.xml
+++ b/examples/PLATINUM/platinum-test.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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>Examples of the D-SI XML implementation for testing of the platinum quality class.</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class PLATINUM (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PLATINUM-TEST-1">
@@ -22,7 +43,7 @@
<si:list>
<si:label>dti_data_package_1</si:label>
<si:dateTime>2019-10-29T10:10:10.000+00:00</si:dateTime>
- <si:list>
+ <si:realList>
<si:real>
<si:label>amplitude_value_1</si:label>
<si:value>0.234</si:value>
@@ -33,8 +54,8 @@
<si:value>1.237</si:value>
<si:unit>\second</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:label>amplitude_value_2</si:label>
<si:value>0.134</si:value>
@@ -45,8 +66,8 @@
<si:value>1.238</si:value>
<si:unit>\second</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:label>amplitude_value_3</si:label>
<si:value>0.334</si:value>
@@ -57,8 +78,8 @@
<si:value>1.239</si:value>
<si:unit>\second</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/SI-Accelaration-examples.xml b/examples/SI-Accelaration-examples.xml
index 389420f3d18f68e3e15363e431893daf166f22a0..0b5e21eab4fed6bf5efc04b71656d15bb6f3cf44 100644
--- a/examples/SI-Accelaration-examples.xml
+++ b/examples/SI-Accelaration-examples.xml
@@ -3,9 +3,30 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
- <!-- einfache Beschreibung -->
- <siTest:metaData>
+ xsi:schemaLocation="https://ptb.de/si/examples platform:/resource/xsd-d-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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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>D-SI examples supporting the implementation of DCCs for acceleration measurements</siTest:testDescription>
</siTest:metaData>
@@ -271,7 +292,7 @@
<siTest:testData id="DCC_ACCELERATION_13">
<!-- Beispiel einer ganzen Ergebniszeile -->
<!-- (Frequenz Anregung Betrag und Phase )-->
- <si:list>
+ <si:realList>
<si:label>results @ 6.3Hz</si:label> <!-- dieses label ist relativ frei wählbar -->
<si:real>
<si:label>frequency</si:label>
@@ -317,8 +338,8 @@
<si:distribution>normal</si:distribution>
</si:expandedUnc>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/SILVER/2020-03-20-UM-SILVER-examples.xml b/examples/SILVER/2020-03-20-UM-SILVER-examples.xml
index 6b09b20114bd0be5fa82b961acca7970616d7d18..d95b92244fe36145ac9ee98336a9b51c2621e74a 100644
--- a/examples/SILVER/2020-03-20-UM-SILVER-examples.xml
+++ b/examples/SILVER/2020-03-20-UM-SILVER-examples.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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 for SmartCom D-SI data with quality class SILVER (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="UM3">
@@ -74,7 +95,7 @@
</siTest:testData>
<siTest:testData id="UM18">
- <si:list>
+ <si:realList>
<si:real>
<si:value>112.34</si:value>
<si:unit>\henry</si:unit>
@@ -95,11 +116,11 @@
<si:distribution>normal</si:distribution>
</si:expandedUnc>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="UM23">
- <si:list>
+ <si:complexList>
<si:listUnit>\bel</si:listUnit>
<si:listUnitPhase>\radian</si:listUnitPhase>
<si:complex>
@@ -110,12 +131,12 @@
<si:valueMagnitude>20.05</si:valueMagnitude>
<si:valuePhase>1.80</si:valuePhase>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="UM28">
<si:list>
- <si:list>
+ <si:realList>
<si:real>
<si:value>135.49</si:value>
<si:unit>\pascal</si:unit>
@@ -124,8 +145,8 @@
<si:value>12.3579</si:value>
<si:unit>\hertz</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:value>212.34567</si:value>
<si:unit>\joule</si:unit>
@@ -134,8 +155,8 @@
<si:value>5.34</si:value>
<si:unit>\hectare</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/SILVER/PTB-SILVER-examples-2.xml b/examples/SILVER/PTB-SILVER-examples-2.xml
index 7cf54b6b146641664027ebe4bdcf644e3a50ad28..02d159136150fe1d33eda89a3a324d59c974249c 100644
--- a/examples/SILVER/PTB-SILVER-examples-2.xml
+++ b/examples/SILVER/PTB-SILVER-examples-2.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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 for SmartCom D-SI data with quality class SILVER (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB533">
@@ -17,4 +38,4 @@
</si:complex>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/SILVER/PTB-SILVER-examples.xml b/examples/SILVER/PTB-SILVER-examples.xml
index c5469a3e5c6dbf9a6b81fdd61a8d9289708a4948..2f43194045d7e62f57a9e0fae9ed60ec604ab11a 100644
--- a/examples/SILVER/PTB-SILVER-examples.xml
+++ b/examples/SILVER/PTB-SILVER-examples.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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 for SmartCom D-SI data with quality class SILVER (data model version 1.3.1)</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB13">
@@ -87,7 +108,7 @@
</siTest:testData>
<siTest:testData id="PTB237">
- <si:list>
+ <si:realList>
<si:listUnit>\tonne</si:listUnit>
<si:real>
<si:value>1.0</si:value>
@@ -95,11 +116,11 @@
<si:real>
<si:value>1.0</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="PTB242">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.0</si:value>
<si:unit>\kelvin</si:unit>
@@ -108,7 +129,7 @@
<si:value>1.0</si:value>
<si:unit>\tonne</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/SILVER/silver-test.xml b/examples/SILVER/silver-test.xml
index 1bed846e6515419d2bc3401639f755f2dfadba21..8d265d1fa8044ddb46304232a186de67bd089de3 100644
--- a/examples/SILVER/silver-test.xml
+++ b/examples/SILVER/silver-test.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
+ xsi:schemaLocation="https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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>Examples of the D-SI XML implementation for testing of the silver quality class.</siTest:testDescription>
+ <siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.0.0)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="SILVER-TEST-1">
@@ -17,4 +38,4 @@
</si:real>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/examples/SI_Format_TestData.xsd b/examples/SI_Format_TestData.xsd
index 6faa71bd700c00e6c5ad56b2d1f9a46d598cf8d7..e474be8638c110f061dcb7c8130781861fd69147 100644
--- a/examples/SI_Format_TestData.xsd
+++ b/examples/SI_Format_TestData.xsd
@@ -5,9 +5,40 @@
xmlns:si="https://ptb.de/si"
elementFormDefault="qualified">
- <xs:import namespace="https://ptb.de/si" schemaLocation="https://www.ptb.de/si/v1.3.1/SI_Format.xsd"/>
+ <xs:import namespace="https://ptb.de/si" schemaLocation="https://www.ptb.de/si/v2.0.0/SI_Format.xsd"/>
-
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ D-SI test data XSD
+ Copyright (c) 2019 - 2021 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
+ the Free Software Foundation, version 3 of the License.
+
+ This XSD 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. See the
+ GNU Lesser General Public License for more details.
+
+ CONTACT: smartcom@ptb.de
+ DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
+ D-SI XSD VERSION: 2.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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.
+ </xs:documentation>
+ <xs:documentation xml:lang="en">
+ ACKNOWLEDGEMENT:
+ The development of the XML scheme is 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.
+ </xs:documentation>
+ </xs:annotation>
+
+
<!-- A simple XML scheme for maintaining multiple XML test examples
for the validation of the D-SI XML implementation.-->
@@ -35,6 +66,8 @@
<xs:element ref="si:real"/>
<xs:element ref="si:complex"/>
<xs:element ref="si:list"/>
+ <xs:element ref="si:realList"/>
+ <xs:element ref="si:complexList"/>
<xs:element ref="si:constant"/>
<xs:element ref="si:hybrid"/>
</xs:choice>
diff --git a/examples/SmartCom_A1.2.3_examples.xml b/examples/SmartCom_A1.2.3_examples.xml
index c39bfd1109ee1cdba703ca6517b2963ac97b5964..61a16e1286b08732b551581491454f50d9a829a7 100644
--- a/examples/SmartCom_A1.2.3_examples.xml
+++ b/examples/SmartCom_A1.2.3_examples.xml
@@ -3,10 +3,31 @@
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://ptb.de/si/examples/SI_Format_TestData.xsd">
- <!-- einfache Beschreibung -->
- <siTest:metaData>
- <siTest:testDescription>Update XML examples for SmartCom metadata format version 1.3.1.</siTest:testDescription>
+ xsi:schemaLocation=" https://ptb.de/si/examples https://www.ptb.de/si/v2.0.0/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.0.0
+ RELEASE DATA: 2021-07-30
+ DOI: 10.5281/zenodo.4709001
+
+ 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>Update XML examples for SmartCom D-SI XML format version 2.0.0.</siTest:testDescription>
</siTest:metaData>
@@ -96,7 +117,7 @@
</siTest:testData>
<siTest:testData id="EXAMPLE-200">
- <si:list>
+ <si:realList>
<si:real>
<si:value>1.00</si:value>
<si:unit>\metre</si:unit>
@@ -105,12 +126,12 @@
<si:value>1.00</si:value>
<si:unit>\second</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="EXAMPLE-208">
<!-- list of complex quantities (option B) -->
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueReal>-10.310</si:valueReal>
<si:valueImag>5.010</si:valueImag>
@@ -121,12 +142,12 @@
<si:valueImag>5.510</si:valueImag>
<si:unit>\volt</si:unit>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="EXAMPLE-211">
<si:list>
- <si:list>
+ <si:realList>
<si:real>
<si:value>2.34</si:value>
<si:unit>\metre</si:unit>
@@ -135,8 +156,8 @@
<si:value>3.34</si:value>
<si:unit>\metre</si:unit>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:real>
<si:value>4.34</si:value>
<si:unit>\metre</si:unit>
@@ -145,12 +166,12 @@
<si:value>5.34</si:value>
<si:unit>\metre</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-201">
- <si:list>
+ <si:realList>
<si:real>
<si:value>2.34</si:value>
<si:unit>\metre</si:unit>
@@ -163,11 +184,11 @@
<si:value>4.34</si:value>
<si:unit>\metre</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="EXAMPLE-203">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:real>
<si:value>2.34</si:value>
@@ -178,12 +199,12 @@
<si:real>
<si:value>4.34</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="EXAMPLE-202">
- <si:list>
+ <si:realList>
<si:listUnit>\metre</si:listUnit>
<si:listUnivariateUnc>
<si:expandedUnc>
@@ -199,12 +220,12 @@
<si:real>
<si:value>3.34</si:value>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="EXAMPLE-202_1">
- <si:list>
+ <si:realList>
<si:real>
<si:value>2.34</si:value>
<si:unit>\metre</si:unit>
@@ -223,9 +244,9 @@
<si:coverageFactor>2</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal</si:distribution>
- </si:expandedUnc>
+ </si:expandedUnc>
</si:real>
- </si:list>
+ </si:realList>
</siTest:testData>
@@ -261,7 +282,7 @@
</siTest:testData>
<siTest:testData id="EXAMPLE-205-1">
- <si:list>
+ <si:realList>
<si:real>
<si:value>2.340</si:value>
<si:unit>\metre</si:unit>
@@ -297,11 +318,11 @@
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal-multivariate</si:distribution>
</si:ellipsoidalRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="EXAMPLE-206">
- <si:list>
+ <si:realList>
<si:real>
<si:value>2.340</si:value>
<si:unit>\metre</si:unit>
@@ -337,12 +358,12 @@
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal-multivariate</si:distribution>
</si:rectangularRegion>
- </si:list>
+ </si:realList>
</siTest:testData>
<siTest:testData id="EXAMPLE-208-2">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueMagnitude>-10.30</si:valueMagnitude>
<si:valuePhase>1.50</si:valuePhase>
@@ -355,11 +376,11 @@
<si:unit>\ampere</si:unit>
<si:unitPhase>\radian</si:unitPhase>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="EXAMPLE-208-3">
- <si:list>
+ <si:complexList>
<si:listUnit>\ampere</si:listUnit>
<si:listUnitPhase>\radian</si:listUnitPhase>
<si:complex>
@@ -370,12 +391,12 @@
<si:valueMagnitude>-12.30</si:valueMagnitude>
<si:valuePhase>1.80</si:valuePhase>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="EXAMPLE-209-3">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueReal>-10.310</si:valueReal>
<si:valueImag>5.010</si:valueImag>
@@ -440,11 +461,11 @@
<si:distribution>normal-bivariate</si:distribution>
</si:ellipsoidalRegion>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="EXAMPLE-209-4">
- <si:list>
+ <si:complexList>
<si:listUnit>\volt</si:listUnit>
<si:listBivariateUnc>
<si:ellipsoidalRegion>
@@ -483,12 +504,12 @@
<si:valueReal>-10.510</si:valueReal>
<si:valueImag>5.510</si:valueImag>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="EXAMPLE-209-5">
- <si:list>
+ <si:complexList>
<si:listUnit>\volt</si:listUnit>
<si:listUnitPhase>\radian</si:listUnitPhase>
<si:listBivariateUnc>
@@ -528,12 +549,12 @@
<si:valueMagnitude>10.543</si:valueMagnitude>
<si:valuePhase>1.937</si:valuePhase>
</si:complex>
- </si:list>
+ </si:complexList>
</siTest:testData>
<siTest:testData id="EXAMPLE-210">
- <si:list>
+ <si:complexList>
<si:complex>
<si:valueMagnitude>11.463</si:valueMagnitude>
<si:valuePhase>2.689</si:valuePhase>
@@ -547,85 +568,85 @@
<si:unitPhase>\degree</si:unitPhase>
</si:complex>
<si:ellipsoidalRegion>
- <si:covarianceMatrix>
- <si:column>
- <si:covariance>
- <si:value>0.050</si:value>
- <si:unit>\ampere\ampere</si:unit>
- </si:covariance>
- <si:covariance>
- <si:value>0.00244</si:value>
- <si:unit>\radian\ampere</si:unit>
- </si:covariance>
- <si:covariance>
- <si:value>0.007</si:value>
- <si:unit>\volt\ampere</si:unit>
- </si:covariance>
- <si:covariance>
- <si:value>0.000</si:value>
- <si:unit>\degree\ampere</si:unit>
- </si:covariance>
- </si:column>
- <si:column>
- <si:covariance>
- <si:value>0.00244</si:value>
- <si:unit>\ampere\radian</si:unit>
- </si:covariance>
- <si:covariance>
- <si:value>0.105</si:value>
- <si:unit>\radian\radian</si:unit>
- </si:covariance>
- <si:covariance>
- <si:value>0.051</si:value>
- <si:unit>\volt\radian</si:unit>
- </si:covariance>
- <si:covariance>
- <si:value>0.109</si:value>
- <si:unit>\degree\radian</si:unit>
- </si:covariance>
- </si:column>
- <si:column>
- <si:covariance>
- <si:value>0.007</si:value>
- <si:unit>\ampere\volt</si:unit>
- </si:covariance>
- <si:covariance>
- <si:value>0.051</si:value>
- <si:unit>\radian\volt</si:unit>
- </si:covariance>
- <si:covariance>
- <si:value>0.076</si:value>
- <si:unit>\volt\volt</si:unit>
- </si:covariance>
- <si:covariance>
- <si:value>0.002</si:value>
- <si:unit>\degree\volt</si:unit>
- </si:covariance>
- </si:column>
- <si:column>
- <si:covariance>
- <si:value>0.000</si:value>
- <si:unit>\ampere\degree</si:unit>
- </si:covariance>
- <si:covariance>
- <si:value>0.109</si:value>
- <si:unit>\radian\degree</si:unit>
- </si:covariance>
- <si:covariance>
- <si:value>0.002</si:value>
- <si:unit>\volt\degree</si:unit>
- </si:covariance>
- <si:covariance>
- <si:value>0.602</si:value>
- <si:unit>\degree\degree</si:unit>
- </si:covariance>
- </si:column>
- </si:covarianceMatrix>
- <si:coverageFactor>3.08</si:coverageFactor>
- <si:coverageProbability>0.95</si:coverageProbability>
- <si:distribution>normal-multivariate</si:distribution>
- </si:ellipsoidalRegion>
- </si:list>
+ <si:covarianceMatrix>
+ <si:column>
+ <si:covariance>
+ <si:value>0.050</si:value>
+ <si:unit>\ampere\ampere</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.00244</si:value>
+ <si:unit>\radian\ampere</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.007</si:value>
+ <si:unit>\volt\ampere</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.000</si:value>
+ <si:unit>\degree\ampere</si:unit>
+ </si:covariance>
+ </si:column>
+ <si:column>
+ <si:covariance>
+ <si:value>0.00244</si:value>
+ <si:unit>\ampere\radian</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.105</si:value>
+ <si:unit>\radian\radian</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.051</si:value>
+ <si:unit>\volt\radian</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.109</si:value>
+ <si:unit>\degree\radian</si:unit>
+ </si:covariance>
+ </si:column>
+ <si:column>
+ <si:covariance>
+ <si:value>0.007</si:value>
+ <si:unit>\ampere\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.051</si:value>
+ <si:unit>\radian\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.076</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.002</si:value>
+ <si:unit>\degree\volt</si:unit>
+ </si:covariance>
+ </si:column>
+ <si:column>
+ <si:covariance>
+ <si:value>0.000</si:value>
+ <si:unit>\ampere\degree</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.109</si:value>
+ <si:unit>\radian\degree</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.002</si:value>
+ <si:unit>\volt\degree</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.602</si:value>
+ <si:unit>\degree\degree</si:unit>
+ </si:covariance>
+ </si:column>
+ </si:covarianceMatrix>
+ <si:coverageFactor>3.08</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal-multivariate</si:distribution>
+ </si:ellipsoidalRegion>
+ </si:complexList>
</siTest:testData>
@@ -637,7 +658,7 @@
-->
<si:list>
<si:label>Monte Carlo Simulation Data</si:label>
- <si:list>
+ <si:realList>
<si:label>Simulation Result</si:label>
<si:real>
<si:value>0.998714286</si:value>
@@ -649,8 +670,8 @@
<si:coverageProbability>0.95</si:coverageProbability>
</si:coverageInterval>
</si:real>
- </si:list>
- <si:list>
+ </si:realList>
+ <si:realList>
<si:label>Monte Carlo Samples</si:label>
<si:real>
<si:value>1.002</si:value>
@@ -680,7 +701,7 @@
<si:value>1.000</si:value>
<si:unit>\metre</si:unit>
</si:real>
- </si:list>
+ </si:realList>
</si:list>
</siTest:testData>
@@ -702,7 +723,7 @@
<siTest:testData id="EXAMPLE-2002">
<si:hybrid>
<!-- A: list from B converted to SI -->
- <si:list>
+ <si:realList>
<si:real>
<si:value>0.00454609</si:value>
<si:unit>\metre\tothe{3}</si:unit>
@@ -711,15 +732,16 @@
<si:label>hardness Rockwell C scale</si:label>
<si:value>63.00</si:value>
<si:unit>\metre\metre\tothe{-1}</si:unit>
+
<si:expandedUnc>
<si:uncertainty>1.56</si:uncertainty>
<si:coverageFactor>2</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:expandedUnc>
</si:real>
- </si:list>
+ </si:realList>
<!-- B: list with non-SI units -->
- <si:list>
+ <si:realList>
<si:real>
<si:value>1</si:value>
<si:unit>gallon(U.K.)</si:unit>
@@ -734,8 +756,8 @@
<si:coverageProbability>0.95</si:coverageProbability>
</si:expandedUnc>
</si:real>
- </si:list>
+ </si:realList>
</si:hybrid>
</siTest:testData>
-</siTest:testDSIXML>
\ No newline at end of file
+</siTest:testDSIXML>
diff --git a/wiki/WIKI.LICENSE b/wiki/WIKI.LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..335af1f6ee8708f5e41b80d5f7d378908ccb410f
--- /dev/null
+++ b/wiki/WIKI.LICENSE
@@ -0,0 +1,95 @@
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+
+Section 1 � Definitions.
+
+ a) Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
+ b) Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
+ c) Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
+ d) Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
+ e) Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
+ f) Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
+ g) Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
+ h) Licensor means the individual(s) or entity(ies) granting rights under this Public License.
+ i) Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
+ j) Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
+ k) You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
+
+Section 2 � Scope.
+
+ a) License grant.
+ 1) Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
+ A) reproduce and Share the Licensed Material, in whole or in part; and
+ B) produce, reproduce, and Share Adapted Material.
+ 2) Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
+ 3) Term. The term of this Public License is specified in Section 6(a).
+ 4) Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
+ 5) Downstream recipients.
+ A) Offer from the Licensor � Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
+ B) No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
+ 6) No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
+
+ b) Other rights.
+ 1) Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
+ 2) Patent and trademark rights are not licensed under this Public License.
+ 3) To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
+
+Section 3 � License Conditions.
+
+ Your exercise of the Licensed Rights is expressly made subject to the following conditions.
+
+ a) Attribution.
+
+ 1) If You Share the Licensed Material (including in modified form), You must:
+ A) retain the following if it is supplied by the Licensor with the Licensed Material:
+ i) identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
+ ii) a copyright notice;
+ iii) a notice that refers to this Public License;
+ iv) a notice that refers to the disclaimer of warranties;
+ v) a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
+ B) indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
+ C) indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
+ 2) You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
+ 3) If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
+ 4) If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License.
+
+Section 4 � Sui Generis Database Rights.
+
+ Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
+
+ a) for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
+ b) if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and
+ c) You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
+
+ For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
+
+Section 5 � Disclaimer of Warranties and Limitation of Liability.
+
+ a) Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
+ b) To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
+
+ c) The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+Section 6 � Term and Termination.
+
+ a) This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
+
+ b) Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
+ 1) automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
+ 2) upon express reinstatement by the Licensor.
+ For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
+ c) For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
+ d) Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
+
+Section 7 � Other Terms and Conditions.
+
+ a) The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
+ b) Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
+
+Section 8 � Interpretation.
+
+ a) For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
+ b) To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
+ c) No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
+ d) Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
\ No newline at end of file
diff --git a/wiki/d-si-online-guide.md b/wiki/d-si-online-guide.md
index 9437c664491c5298aa69409053ad62e20b10dd25..bd57b9e341a620dbc287f06b933a3a712617164d 100644
--- a/wiki/d-si-online-guide.md
+++ b/wiki/d-si-online-guide.md
@@ -2,43 +2,96 @@
<br />
<div align="center">
<a href="https://ptb.de/si" traget="_blank"><img src="doc/D-SI1.PNG" alt="D-SI Logo" width="300"/></a>
+ <br />
+ XSD Version 2.0.0
<br /><br />
+
</div>
- <p>This Online Guide specifies the principles for the exchange of machine-readable data for
+
+<p>
+This Online Guide specifies the principles for the exchange of machine-readable data in eXtensible Markup Language (XML) for
all applications that transfer or require measurement data according to the specifications of
- the Système International d’Unités (SI) [[1]](https://www.bipm.org/en/publications/si-brochure/). It provides data models for the transfer of real
- quantities (including constants), complex quantities and vector quantities (lists of quantities)
- and hybrid quantities.</p>
+ the Digital System of Units (D-SI) metadata model [[1]](https://doi.org/10.5281/zenodo.3816686).
+</p>
-<br />
+**Features of D-SI XML implementation (XSD Version 2.0.0)**
+ * units of measure provided by SI units [[2]](https://www.bipm.org/en/publications/si-brochure)
+ * structures for real quantities and fundamental constants
+ * structures for complex quantites with Cartesian and polar coordinate form
+ * structures for vectorial quantities of real, complex and list elements
+ * structures for covariance matrix, univariate and multivaraite measurment uncertainty
+ * hybrid element structure for adaption non-SI units of measurement
- <p>Uniform data format is presented in Figure below. Value and unit are the minimum requirement.</p>
-
- <img src="doc/unidata.png" alt="D-SI Logo" width="500"/>
+**Versions of the D-SI metadata model and the XML implementation**
+The D-SI metadata model makes reccomendations for an unambiguous, universal, safe and uniform digital exchange of
+metrological data indipendent from any specific format like binary data, XML, JSON etc. This XML implementation
+supports version 1.3 of the D-SI metadata model [[1]](https://doi.org/10.5281/zenodo.3816686). The XML is defined through
+an XML Schema Definition file (XSD). The version number of the XSD is 2.0.0 as this update introduced some breaking changes.
+For convenience, this documentation for version 2.0.0 will provide the relevant information from the underlying D-SI
+metadata model in closed form.
-#### This tutorial supplements some basic examples for each of the root elements.
+## Content of documentation
-<div align="left">
- <p>[- si:real Examples](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/tree/feat-online-guide/wiki/examples/real_example.md)</p>
- <p>[- si:constant Examples](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/tree/feat-online-guide/wiki/examples/constant_example.md)</p>
- <p>[- si:complex Examples](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/tree/feat-online-guide/wiki/examples/complex_example.md)</p>
- <p>[- si:list Examples](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/tree/feat-online-guide/wiki/examples/list_example.md)</p>
- <p>[- si:hybid Examples](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/tree/feat-online-guide/wiki/examples/hybrid_example.md)</p>
-</div>
+1. [Real quantity](wiki/doc/RealQuantity.md)
+2. [Structure for SI units](wiki/doc/StructureSIUnits.md)
+3. [Coverage regions](wiki/doc/CoverageRegions.md)
+4. [Complex quantity](wiki/doc/ComplexQuantity.md)
+5. [List Data Model (general)](wiki/doc/ListDataModel.md)
+6. [List of real quantities](wiki/doc/RealList.md)
+7. [List of complex quantities](wiki/doc/ComplexList.md)
+8. [Structure for non-SI units (hybrid)](wiki/doc/Hybrid.md)
+
+## Further examples and guidance
+
+<!-- * [Example: Monte Carlo simulation data](wiki/doc/ExampleMonteCarloData.md) -->
+* [Example: D-SI classification PLATINUM, GOLD, SILVER, BRONZE, IMPROVABLE](wiki/doc/ExampleD-SIClassification.md)<!-- * [Good practise: Temperature, Humidity, Pressure](wiki/doc/GoodPractiseTempHuPre.md) -->
+* [Good practise: Uncertainty Calculation](wiki/doc/GoodPractiseConstantsUncertainty.md)
+* [Uptake: Digital Calibration Certificate (redirection to PTB webpage)](https://www.ptb.de/dcc)
+* [Uptake: Maschine-readable CODATA constants (redirection to Zenodo)](https://doi.org/10.5281/zenodo.3688428)
+* [Uptake: TraCIM D-SI data classification (redirection to Zenodo)](https://doi.org/10.5281/zenodo.3953555)
+
+## License
+
+This repository contains the XML Schema Definition (XSD), a documentation and examples for the D-SI (Digital System of Units).
+
+The XSD is licensed by Physikalisch-Technische Bundesanstalt under [GNU LGPL v3](/COPYING.LESSER).
+
+The documentation and examples are licenced by Physikalisch-Technische Bundesanstalt under [Creative Commons Attribution 4.0 International License](wiki/WIKI.LICENSE).
+
+## Liability
+
+This XSD 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. See the
+[GNU Lesser General Public License](/COPYING.LESSER) for more details.
+
+
+## Citing the XSD
+
+A citeable resource for this release is available under the DOI [10.5281/zenodo.4709001](https://doi.org/10.5281/zenodo.3366901) at Zenodo.
+
+## Authors of documentation
+
+D. Hutzschenreuter, Physikalisch-Technische Bundesanstalt
+
+## Acknowledgement
+
+The development of the XML scheme is 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.
+
+Special thanks go to C. Brown, B. Gloger, J. H. Loewe and J. Rethmeier from Physikalisch-Technische Bundesanstalt for their indispensable
+support in preparation of the release.
+
+## References
-#### More detailed description is presented in online documents:
+[1] [SmartCom Digital System of Units (D-SI) Guide for the use of the metadata-format used in metrology for the easy-to-use, safe, harmonised and unambiguous digital transfer of metrological data](https://doi.org/10.5281/zenodo.3816686)
-[1] [BIPM Brochure, The international System of Units (SI) 9th edition 2019](https://www.bipm.org/en/publications/si-brochure/)
+[2] [BIPM SI brochure 9th edition 2019](https://www.bipm.org/en/publications/si-brochure)
-[2] [SmartCom Digital System of Units (D-SI) Guide for the use of the metadata-format used in metrology for the easy-to-use, safe, harmonised and unambiguous digital transfer of metrological data](https://doi.org/10.5281/zenodo.3816686)
+[3] [Project EMPIR 17IND02 SmartCom](https://www.ptb.de/empir2018/smartcom/project/)
-[3] [SmartCom Digital System of Units (D-SI) Outline of the complete metadata model](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/blob/feat-online-guide/wiki/doc/SmartCom_D-SI_v1.3.pdf)
-[4] [CODATA RECOMMENDED VALUES OF THE FUNDAMENTAL PHYSICAL CONSTANTS: 2018NIST SP 961 (May 2019)](https://physics.nist.gov/cuu/pdf/wall_2018.pdf)
+---
-<!--<table style="width:100%">
- <tr>
- <td><img src="doc/real_expand_unc.PNG" alt="root" /></td>
- <td><img src="doc/real_expand_unc_xsd.PNG" alt="root" /></td>
- </tr>
-</table>-->
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
diff --git a/wiki/doc/ComplexList.md b/wiki/doc/ComplexList.md
new file mode 100644
index 0000000000000000000000000000000000000000..c36b2c071b60d21ff4ce4bfa38949d2681196d37
--- /dev/null
+++ b/wiki/doc/ComplexList.md
@@ -0,0 +1,359 @@
+## 7. List of complex quantities
+
+<img alt="D-SI-Image-7.1" width="800" style="border-width:10" src="wiki/doc/D-SI-7.1.PNG" /></a>
+---
+<img alt="D-SI-Image-7.2" width="800" style="border-width:10" src="wiki/doc/D-SI-7.2.PNG" /></a>
+---
+<img alt="D-SI-Image-7.3" width="600" style="border-width:10" src="wiki/doc/D-SI-7.3.PNG" /></a>
+---
+<img alt="D-SI-Image-7.4" width="600" style="border-width:10" src="wiki/doc/D-SI-7.4.PNG" /></a>
+
+<details><summary><strong>Show full XML example (left)</strong></summary>
+
+```xml
+
+<si:complexList>
+ <si:complex>
+ <si:valueMagnitude>-10.30</si:valueMagnitude>
+ <si:valuePhase>1.50</si:valuePhase>
+ <si:unit>\ampere</si:unit>
+ <si:unitPhase>\radian</si:unitPhase>
+ </si:complex>
+ <si:complex>
+ <si:valueMagnitude>-12.30</si:valueMagnitude>
+ <si:valuePhase>1.80</si:valuePhase>
+ <si:unit>\ampere</si:unit>
+ <si:unitPhase>\radian</si:unitPhase>
+ </si:complex>
+</si:complexList>
+
+```
+
+</details>
+
+<details><summary><strong>Show full XML example (right)</strong></summary>
+
+```xml
+
+<si:complexList>
+ <si:listUnit>\ampere</si:listUnit>
+ <si:listUnitPhase>\radian</si:listUnitPhase>
+ <si:complex>
+ <si:valueMagnitude>-10.0</si:valueMagnitude>
+ <si:valuePhase>1.50</si:valuePhase>
+ </si:complex>
+ <si:complex>
+ <si:valueMagnitude>-12.30</si:valueMagnitude>
+ <si:valuePhase>1.80</si:valuePhase>
+ </si:complex>
+</si:complexList>
+
+```
+
+</details>
+
+
+
+---
+<img alt="D-SI-Image-7.5" width="800" style="border-width:10" src="wiki/doc/D-SI-7.5.PNG" /></a>
+---
+<img alt="D-SI-Image-7.6" width="600" style="border-width:10" src="wiki/doc/D-SI-7.6.PNG" /></a>
+---
+<img alt="D-SI-Image-7.7" width="800" style="border-width:10" src="wiki/doc/D-SI-7.7.PNG" /></a>
+
+<details><summary><strong>Show full XML example</strong></summary>
+
+```xml
+
+<si:complexList>
+ <si:complex>
+ <si:valueReal>-10.310</si:valueReal>
+ <si:valueImag>5.010</si:valueImag>
+ <si:unit>\volt</si:unit>
+ <si:ellipsoidalRegion>
+ <si:covarianceMatrix>
+ <si:column>
+ <si:covariance>
+ <si:value>0.050</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>-0.003</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ </si:column>
+ <si:column>
+ <si:covariance>
+ <si:value>-0.003</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.105</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ </si:column>
+ </si:covarianceMatrix>
+ <si:coverageFactor>2.45</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal-bivariate</si:distribution>
+ </si:ellipsoidalRegion>
+ </si:complex>
+ <si:complex>
+ <si:valueReal>-10.510</si:valueReal>
+ <si:valueImag>5.510</si:valueImag>
+ <si:unit>\volt</si:unit>
+ <si:ellipsoidalRegion>
+ <si:covarianceMatrix>
+ <si:column>
+ <si:covariance>
+ <si:value>0.050</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>-0.003</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ </si:column>
+ <si:column>
+ <si:covariance>
+ <si:value>-0.003</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.105</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ </si:column>
+ </si:covarianceMatrix>
+ <si:coverageFactor>2.45</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal-bivariate</si:distribution>
+ </si:ellipsoidalRegion>
+ </si:complex>
+</si:complexList>
+
+```
+
+</details>
+
+---
+
+<img alt="D-SI-Image-7.8" width="800" style="border-width:10" src="wiki/doc/D-SI-7.8.PNG" /></a>
+
+<details><summary><strong>Show full XML example</strong></summary>
+
+```xml
+
+<si:complexList>
+ <si:listUnit>\volt</si:listUnit>
+ <si:listBivariateUnc>
+ <si:ellipsoidalRegion>
+ <si:covarianceMatrix>
+ <si:column>
+ <si:covariance>
+ <si:value>0.050</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>-0.003</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ </si:column>
+ <si:column>
+ <si:covariance>
+ <si:value>-0.003</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.105</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ </si:column>
+ </si:covarianceMatrix>
+ <si:coverageFactor>2.45</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal-bivariate</si:distribution>
+ </si:ellipsoidalRegion>
+ </si:listBivariateUnc>
+ <si:complex>
+ <si:valueReal>-10.310</si:valueReal>
+ <si:valueImag>5.010</si:valueImag>
+ </si:complex>
+ <si:complex>
+ <si:valueReal>-10.510</si:valueReal>
+ <si:valueImag>5.510</si:valueImag>
+ </si:complex>
+</si:complexList>
+
+```
+
+</details>
+
+---
+<img alt="D-SI-Image-7.9" width="800" style="border-width:10" src="wiki/doc/D-SI-7.9.PNG" /></a>
+
+<details><summary><strong>Show full XML example</strong></summary>
+
+```xml
+
+<si:complexList>
+ <si:listUnit>\volt</si:listUnit>
+ <si:listUnitPhase>\radian</si:listUnitPhase>
+ <si:listBivariateUnc>
+ <si:ellipsoidalRegion>
+ <si:covarianceMatrix>
+ <si:column>
+ <si:covariance>
+ <si:value>0.050</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>-0.003</si:value>
+ <si:unit>\radian\volt</si:unit>
+ </si:covariance>
+ </si:column>
+ <si:column>
+ <si:covariance>
+ <si:value>-0.003</si:value>
+ <si:unit>\volt\radian</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.105</si:value>
+ <si:unit>\radian\radian</si:unit>
+ </si:covariance>
+ </si:column>
+ </si:covarianceMatrix>
+ <si:coverageFactor>2.45</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal-bivariate</si:distribution>
+ </si:ellipsoidalRegion>
+ </si:listBivariateUnc>
+ <si:complex>
+ <si:valueMagnitude>11.463</si:valueMagnitude>
+ <si:valuePhase>2.689</si:valuePhase>
+ </si:complex>
+ <si:complex>
+ <si:valueMagnitude>10.543</si:valueMagnitude>
+ <si:valuePhase>1.937</si:valuePhase>
+ </si:complex>
+</si:complexList>
+
+```
+
+</details>
+
+---
+<img alt="D-SI-Image-7.10" width="800" style="border-width:10" src="wiki/doc/D-SI-7.10.PNG" /></a>
+---
+
+<img alt="D-SI-Image-7.11" width="800" style="border-width:10" src="wiki/doc/D-SI-7.11.PNG" /></a>
+<img alt="D-SI-Image-7.12" width="800" style="border-width:10" src="wiki/doc/D-SI-7.12.PNG" /></a>
+
+<details><summary><strong>Show full XML example</strong></summary>
+
+```xml
+
+<si:complexList>
+ <si:complex>
+ <si:valueMagnitude>11.463</si:valueMagnitude>
+ <si:valuePhase>2.689</si:valuePhase>
+ <si:unit>\ampere</si:unit>
+ <si:unitPhase>\radian</si:unitPhase>
+ </si:complex>
+ <si:complex>
+ <si:valueMagnitude>10.543</si:valueMagnitude>
+ <si:valuePhase>1.937</si:valuePhase>
+ <si:unit>\volt</si:unit>
+ <si:unitPhase>\degree</si:unitPhase>
+ </si:complex>
+ <si:ellipsoidalRegion>
+ <si:covarianceMatrix>
+ <si:column>
+ <si:covariance>
+ <si:value>0.050</si:value>
+ <si:unit>\ampere\ampere</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.00244</si:value>
+ <si:unit>\radian\ampere</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.007</si:value>
+ <si:unit>\volt\ampere</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.000</si:value>
+ <si:unit>\degree\ampere</si:unit>
+ </si:covariance>
+ </si:column>
+ <si:column>
+ <si:covariance>
+ <si:value>0.00244</si:value>
+ <si:unit>\ampere\radian</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.105</si:value>
+ <si:unit>\radian\radian</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.051</si:value>
+ <si:unit>\volt\radian</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.109</si:value>
+ <si:unit>\degree\radian</si:unit>
+ </si:covariance>
+ </si:column>
+ <si:column>
+ <si:covariance>
+ <si:value>0.007</si:value>
+ <si:unit>\ampere\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.051</si:value>
+ <si:unit>\radian\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.076</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.002</si:value>
+ <si:unit>\degree\volt</si:unit>
+ </si:covariance>
+ </si:column>
+ <si:column>
+ <si:covariance>
+ <si:value>0.000</si:value>
+ <si:unit>\ampere\degree</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.109</si:value>
+ <si:unit>\radian\degree</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.002</si:value>
+ <si:unit>\volt\degree</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.602</si:value>
+ <si:unit>\degree\degree</si:unit>
+ </si:covariance>
+ </si:column>
+ </si:covarianceMatrix>
+ <si:coverageFactor>3.08</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal-multivariate</si:distribution>
+ </si:ellipsoidalRegion>
+</si:complexList>
+
+```
+
+</details>
+
+---
+
+[**Previous Chapter 6 <<**](wiki/doc/RealList.md) [**Home**](wiki/d-si-online-guide.md) [**>> Next Chapter 8**](wiki/doc/Hybrid.md)
+
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
diff --git a/wiki/doc/ComplexQuantity.md b/wiki/doc/ComplexQuantity.md
new file mode 100644
index 0000000000000000000000000000000000000000..1052b7c73d0c778eeaf699f4952237ef8b2fa0cd
--- /dev/null
+++ b/wiki/doc/ComplexQuantity.md
@@ -0,0 +1,93 @@
+## 4. Complex Quantity
+
+<img alt="D-SI-Image-4.1" width="800" style="border-width:10" src="wiki/doc/D-SI-4.1.PNG" /></a>
+---
+<img alt="D-SI-Image-4.2" width="600" style="border-width:10" src="wiki/doc/D-SI-4.2.PNG" /></a>
+---
+<img alt="D-SI-Image-4.3" width="600" style="border-width:10" src="wiki/doc/D-SI-4.3.PNG" /></a>
+---
+<img alt="D-SI-Image-4.4" width="600" style="border-width:10" src="wiki/doc/D-SI-4.4.PNG" /></a>
+
+<details><summary><strong>Show full XML example (top)</strong></summary>
+
+```xml
+
+<si:complex>
+ <si:label>amplifier signal</si:label>
+ <si:valueReal>-10.310</si:valueReal>
+ <si:valueImag>5.010</si:valueImag>
+ <si:unit>\volt</si:unit>
+</si:complex>
+
+```
+
+</details>
+
+<details><summary><strong>Show full XML example (bottom)</strong></summary>
+
+```xml
+
+<si:complex>
+ <si:label>amplifier signal</si:label>
+ <si:valueMagnitude>11.463</si:valueMagnitude>
+ <si:valuePhase>2.689</si:valuePhase>
+ <si:unit>\volt</si:unit>
+ <si:unitPhase>\radian</si:unitPhase>
+</si:complex>
+
+```
+
+</details>
+
+---
+<img alt="D-SI-Image-4.5" width="800" style="border-width:10" src="wiki/doc/D-SI-4.5.PNG" /></a>
+---
+<img alt="D-SI-Image-4.6" width="600" style="border-width:10" src="wiki/doc/D-SI-4.6.PNG" /></a>
+
+<details><summary><strong>Show full XML example </strong></summary>
+
+```xml
+
+<si:complex>
+ <si:valueReal>-10.310</si:valueReal>
+ <si:valueImag>5.010</si:valueImag>
+ <si:unit>\volt</si:unit>
+ <si:ellipsoidalRegion>
+ <si:covarianceMatrix>
+ <si:column>
+ <si:covariance>
+ <si:value>0.050</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>-0.003</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ </si:column>
+ <si:column>
+ <si:covariance>
+ <si:value>-0.003</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.105</si:value>
+ <si:unit>\volt\volt</si:unit>
+ </si:covariance>
+ </si:column>
+ </si:covarianceMatrix>
+ <si:coverageFactor>2.45</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal-bivariate</si:distribution>
+ </si:ellipsoidalRegion>
+</si:complex>
+
+```
+
+</details>
+
+---
+
+[**Previous Chapter 3 <<**](wiki/doc/CoverageRegions.md) [**Home**](wiki/d-si-online-guide.md) [**>> Next Chapter 5**](wiki/doc/ListDataModel.md)
+
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
diff --git a/wiki/doc/CoverageRegions.md b/wiki/doc/CoverageRegions.md
new file mode 100644
index 0000000000000000000000000000000000000000..22cb4e599788c530bf0a9a967e1b11c83b2db257
--- /dev/null
+++ b/wiki/doc/CoverageRegions.md
@@ -0,0 +1,57 @@
+## 3. Coverage Regions
+
+<img alt="D-SI-Image-3.1" width="600" style="border-width:10" src="wiki/doc/D-SI-3.1.PNG" /></a>
+---
+<img alt="D-SI-Image-3.2" width="600" style="border-width:10" src="wiki/doc/D-SI-3.2.PNG" /></a>
+---
+<img alt="D-SI-Image-3.3" width="600" style="border-width:10" src="wiki/doc/D-SI-3.3.PNG" /></a>
+---
+<img alt="D-SI-Image-3.4" width="600" style="border-width:10" src="wiki/doc/D-SI-3.4.PNG" /></a>
+---
+<img alt="D-SI-Image-3.5" width="600" style="border-width:10" src="wiki/doc/D-SI-3.5.PNG" /></a>
+---
+<img alt="D-SI-Image-3.6" width="800" style="border-width:10" src="wiki/doc/D-SI-3.6.PNG" /></a>
+---
+<img alt="D-SI-Image-3.7" width="800" style="border-width:10" src="wiki/doc/D-SI-3.7.PNG" /></a>
+
+<details><summary><strong>Show full XML example</strong></summary>
+
+```xml
+
+<si:covarianceMatrix>
+ <!-- first (left) column of matrix -->
+ <si:column>
+ <si:covariance>
+ <si:value>0.212</si:value>
+ <si:unit>\metre\metre</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.051</si:value>
+ <si:unit>\second\metre</si:unit>
+ </si:covariance>
+ </si:column>
+ <!-- first (right) column of matrix -->
+ <si:column>
+ <si:covariance>
+ <si:value>0.051</si:value>
+ <si:unit>\metre\second</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.101</si:value>
+ <si:unit>\second\second</si:unit>
+ </si:covariance>
+ </si:column>
+</si:covarianceMatrix>
+
+```
+
+</details>
+
+---
+<img alt="D-SI-Image-3.8" width="600" style="border-width:10" src="wiki/doc/D-SI-3.8.PNG" /></a>
+---
+
+[**Previous Chapter 2 <<**](wiki/doc/StructureSIUnits.md) [**Home**](wiki/d-si-online-guide.md) [**>> Next Chapter 4**](wiki/doc/ComplexQuantity.md)
+
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
diff --git a/wiki/doc/D-SI-1.1.PNG b/wiki/doc/D-SI-1.1.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..ff9b30157280fca065ed6bb1c8485e3972375ca5
Binary files /dev/null and b/wiki/doc/D-SI-1.1.PNG differ
diff --git a/wiki/doc/D-SI-1.10.PNG b/wiki/doc/D-SI-1.10.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..d1251fb9371727737bcabd306ef989fc43e770cb
Binary files /dev/null and b/wiki/doc/D-SI-1.10.PNG differ
diff --git a/wiki/doc/D-SI-1.11.PNG b/wiki/doc/D-SI-1.11.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..18c4eaf43b1e1b5b77d5fd4fe7967c10fd908c99
Binary files /dev/null and b/wiki/doc/D-SI-1.11.PNG differ
diff --git a/wiki/doc/D-SI-1.12.PNG b/wiki/doc/D-SI-1.12.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..10a927c713ec202fe9ae2fd949bda922e994f4b7
Binary files /dev/null and b/wiki/doc/D-SI-1.12.PNG differ
diff --git a/wiki/doc/D-SI-1.13.PNG b/wiki/doc/D-SI-1.13.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..70110c6df38189a0f6028ae8224e69ea6e2696b3
Binary files /dev/null and b/wiki/doc/D-SI-1.13.PNG differ
diff --git a/wiki/doc/D-SI-1.14.PNG b/wiki/doc/D-SI-1.14.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..6125b6f7dd42152fd797de4c8524c3c3eda6c09d
Binary files /dev/null and b/wiki/doc/D-SI-1.14.PNG differ
diff --git a/wiki/doc/D-SI-1.2.PNG b/wiki/doc/D-SI-1.2.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..8147bd9b4087bd2d30fb79c9be35a1a67cb46f32
Binary files /dev/null and b/wiki/doc/D-SI-1.2.PNG differ
diff --git a/wiki/doc/D-SI-1.3.PNG b/wiki/doc/D-SI-1.3.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..ed27624cbb2d48fa89657b651ef42a135a1a074f
Binary files /dev/null and b/wiki/doc/D-SI-1.3.PNG differ
diff --git a/wiki/doc/D-SI-1.4.PNG b/wiki/doc/D-SI-1.4.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..351513511522d22abbfb12a4e30cc26245a3c604
Binary files /dev/null and b/wiki/doc/D-SI-1.4.PNG differ
diff --git a/wiki/doc/D-SI-1.5.PNG b/wiki/doc/D-SI-1.5.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..94b4b06c76ffc5676c7422755ebf8a1e2cef48c4
Binary files /dev/null and b/wiki/doc/D-SI-1.5.PNG differ
diff --git a/wiki/doc/D-SI-1.6.PNG b/wiki/doc/D-SI-1.6.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..a1fb23682bf7fc8f06d4a1d4c18e3aff979b11d4
Binary files /dev/null and b/wiki/doc/D-SI-1.6.PNG differ
diff --git a/wiki/doc/D-SI-1.7.PNG b/wiki/doc/D-SI-1.7.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..147399baaeb2a5a798eaff6f06a75760abe17b6a
Binary files /dev/null and b/wiki/doc/D-SI-1.7.PNG differ
diff --git a/wiki/doc/D-SI-1.8.PNG b/wiki/doc/D-SI-1.8.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..7682d8e24fa545f8003e9b95b7e8f7cdfe65a4d6
Binary files /dev/null and b/wiki/doc/D-SI-1.8.PNG differ
diff --git a/wiki/doc/D-SI-1.9.PNG b/wiki/doc/D-SI-1.9.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..87bb257653caddc6e2603dbf8bafeccbe744dbdf
Binary files /dev/null and b/wiki/doc/D-SI-1.9.PNG differ
diff --git a/wiki/doc/D-SI-2.1.PNG b/wiki/doc/D-SI-2.1.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..1e5dcac1e3e8067ad5bdf20beb716e5f8690c99a
Binary files /dev/null and b/wiki/doc/D-SI-2.1.PNG differ
diff --git a/wiki/doc/D-SI-2.2.PNG b/wiki/doc/D-SI-2.2.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..da7b132fd947902d3bd8476e8c406bcb1e961999
Binary files /dev/null and b/wiki/doc/D-SI-2.2.PNG differ
diff --git a/wiki/doc/D-SI-2.3.PNG b/wiki/doc/D-SI-2.3.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..9f643dce915b65825c935e40c557f39b7f6725f8
Binary files /dev/null and b/wiki/doc/D-SI-2.3.PNG differ
diff --git a/wiki/doc/D-SI-2.4.PNG b/wiki/doc/D-SI-2.4.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..797ab88e821afabed646331e3651c5b059e6e1da
Binary files /dev/null and b/wiki/doc/D-SI-2.4.PNG differ
diff --git a/wiki/doc/D-SI-2.5.PNG b/wiki/doc/D-SI-2.5.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..71339a272a0f76a7330bc2a04e3cd068982ebcc6
Binary files /dev/null and b/wiki/doc/D-SI-2.5.PNG differ
diff --git a/wiki/doc/D-SI-2.6.PNG b/wiki/doc/D-SI-2.6.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..0e24afc3549beb63558e0a2cf7b9397a349e7cbf
Binary files /dev/null and b/wiki/doc/D-SI-2.6.PNG differ
diff --git a/wiki/doc/D-SI-2.7.PNG b/wiki/doc/D-SI-2.7.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..f79dea04035214ccef330ba2b812de7e721a7cea
Binary files /dev/null and b/wiki/doc/D-SI-2.7.PNG differ
diff --git a/wiki/doc/D-SI-3.1.PNG b/wiki/doc/D-SI-3.1.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..b153561dda57fc0d43fe49c4ce256790ae30be33
Binary files /dev/null and b/wiki/doc/D-SI-3.1.PNG differ
diff --git a/wiki/doc/D-SI-3.2.PNG b/wiki/doc/D-SI-3.2.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..ed1c1fec2b473ab0fe4c4f51163a44297b0311ef
Binary files /dev/null and b/wiki/doc/D-SI-3.2.PNG differ
diff --git a/wiki/doc/D-SI-3.3.PNG b/wiki/doc/D-SI-3.3.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..48a22abae98eddef1aa1bbbcc05fc4c95a629628
Binary files /dev/null and b/wiki/doc/D-SI-3.3.PNG differ
diff --git a/wiki/doc/D-SI-3.4.PNG b/wiki/doc/D-SI-3.4.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..414df0f8a3c6c9091343ff9cb729a4529ffd4b09
Binary files /dev/null and b/wiki/doc/D-SI-3.4.PNG differ
diff --git a/wiki/doc/D-SI-3.5.PNG b/wiki/doc/D-SI-3.5.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..7d22ed8d71f6bb686193e768ddc9aecc88c0fc5c
Binary files /dev/null and b/wiki/doc/D-SI-3.5.PNG differ
diff --git a/wiki/doc/D-SI-3.6.PNG b/wiki/doc/D-SI-3.6.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..0e443349db5f3c64f873c640b8c5de10a519702a
Binary files /dev/null and b/wiki/doc/D-SI-3.6.PNG differ
diff --git a/wiki/doc/D-SI-3.7.PNG b/wiki/doc/D-SI-3.7.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..9bddcc3b6c0508c2383ae046451e91ec62c49bb6
Binary files /dev/null and b/wiki/doc/D-SI-3.7.PNG differ
diff --git a/wiki/doc/D-SI-3.8.PNG b/wiki/doc/D-SI-3.8.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..c4ecbf2ea55b894a4aa52657c8c1351336fdb8e7
Binary files /dev/null and b/wiki/doc/D-SI-3.8.PNG differ
diff --git a/wiki/doc/D-SI-4.1.PNG b/wiki/doc/D-SI-4.1.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..f34ed9de794fa2ad9439b7c8f186be4b17dd1027
Binary files /dev/null and b/wiki/doc/D-SI-4.1.PNG differ
diff --git a/wiki/doc/D-SI-4.2.PNG b/wiki/doc/D-SI-4.2.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..95bb84740ee253fb6cc8235c894d9b588ed7c29d
Binary files /dev/null and b/wiki/doc/D-SI-4.2.PNG differ
diff --git a/wiki/doc/D-SI-4.3.PNG b/wiki/doc/D-SI-4.3.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..210f720d093c5efe0a48bd8eb083507980ebc7ca
Binary files /dev/null and b/wiki/doc/D-SI-4.3.PNG differ
diff --git a/wiki/doc/D-SI-4.4.PNG b/wiki/doc/D-SI-4.4.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..99e503b6b18ba12cbb747ba300dc6fc9f8c1fbab
Binary files /dev/null and b/wiki/doc/D-SI-4.4.PNG differ
diff --git a/wiki/doc/D-SI-4.5.PNG b/wiki/doc/D-SI-4.5.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..3d9ffebdd897cb99d22bf26db25b8ce63024aaf6
Binary files /dev/null and b/wiki/doc/D-SI-4.5.PNG differ
diff --git a/wiki/doc/D-SI-4.6.PNG b/wiki/doc/D-SI-4.6.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..531e6df033ba782b250fb841979dd159d0c5fc7b
Binary files /dev/null and b/wiki/doc/D-SI-4.6.PNG differ
diff --git a/wiki/doc/D-SI-5.1.PNG b/wiki/doc/D-SI-5.1.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..84ae04087bbf376365534835ea2b00630238c198
Binary files /dev/null and b/wiki/doc/D-SI-5.1.PNG differ
diff --git a/wiki/doc/D-SI-5.2.PNG b/wiki/doc/D-SI-5.2.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..e5ce14d0fbc803a157fbf6802abdb09ca77f3fe2
Binary files /dev/null and b/wiki/doc/D-SI-5.2.PNG differ
diff --git a/wiki/doc/D-SI-5.3.PNG b/wiki/doc/D-SI-5.3.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..53d859dad95b8a455b5c0e9701f4497939274317
Binary files /dev/null and b/wiki/doc/D-SI-5.3.PNG differ
diff --git a/wiki/doc/D-SI-5.4.PNG b/wiki/doc/D-SI-5.4.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..48db8c06f6f13729ed359795a75f133baba5bc0d
Binary files /dev/null and b/wiki/doc/D-SI-5.4.PNG differ
diff --git a/wiki/doc/D-SI-6.1.PNG b/wiki/doc/D-SI-6.1.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..9bd8f78ad11fc3817cd685159fe642e4ccd6832f
Binary files /dev/null and b/wiki/doc/D-SI-6.1.PNG differ
diff --git a/wiki/doc/D-SI-6.10.PNG b/wiki/doc/D-SI-6.10.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..f2a1deac09eeedf356e16f467b2140c45bb0c7c4
Binary files /dev/null and b/wiki/doc/D-SI-6.10.PNG differ
diff --git a/wiki/doc/D-SI-6.11.PNG b/wiki/doc/D-SI-6.11.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..f0635665e611df5e7ec9f8c88ccd5822daeef1b9
Binary files /dev/null and b/wiki/doc/D-SI-6.11.PNG differ
diff --git a/wiki/doc/D-SI-6.2.PNG b/wiki/doc/D-SI-6.2.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..252d0053e9a8bedfc4024cb30934c428c7f110ec
Binary files /dev/null and b/wiki/doc/D-SI-6.2.PNG differ
diff --git a/wiki/doc/D-SI-6.3.PNG b/wiki/doc/D-SI-6.3.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..715399baa9ee822ddb846fd21212999830069ef1
Binary files /dev/null and b/wiki/doc/D-SI-6.3.PNG differ
diff --git a/wiki/doc/D-SI-6.4.PNG b/wiki/doc/D-SI-6.4.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..b43eca943c55fdf504e32c111ec68971001a3796
Binary files /dev/null and b/wiki/doc/D-SI-6.4.PNG differ
diff --git a/wiki/doc/D-SI-6.5.PNG b/wiki/doc/D-SI-6.5.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..2e754987075be9dcd578a2eba68f82c3829b2d7b
Binary files /dev/null and b/wiki/doc/D-SI-6.5.PNG differ
diff --git a/wiki/doc/D-SI-6.6.PNG b/wiki/doc/D-SI-6.6.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..4ece1a550b6a61b9f224225452ef7b9c7e90ac12
Binary files /dev/null and b/wiki/doc/D-SI-6.6.PNG differ
diff --git a/wiki/doc/D-SI-6.7.PNG b/wiki/doc/D-SI-6.7.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..325c76e952fabbf3d7dd466e55d43f4d02d6e8e1
Binary files /dev/null and b/wiki/doc/D-SI-6.7.PNG differ
diff --git a/wiki/doc/D-SI-6.8.PNG b/wiki/doc/D-SI-6.8.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..71473b4d358dd4e8f0ef6ff7f4e6d1fa7ca39f63
Binary files /dev/null and b/wiki/doc/D-SI-6.8.PNG differ
diff --git a/wiki/doc/D-SI-6.9.PNG b/wiki/doc/D-SI-6.9.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..eb77f365eef5924008901bf0d0cb9d7ff8132a58
Binary files /dev/null and b/wiki/doc/D-SI-6.9.PNG differ
diff --git a/wiki/doc/D-SI-7.1.PNG b/wiki/doc/D-SI-7.1.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..03e53f25c667064a194656850a562cbaa8cb3a91
Binary files /dev/null and b/wiki/doc/D-SI-7.1.PNG differ
diff --git a/wiki/doc/D-SI-7.10.PNG b/wiki/doc/D-SI-7.10.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..36be1682935206ec439b3bec11f79cfbb06efbb9
Binary files /dev/null and b/wiki/doc/D-SI-7.10.PNG differ
diff --git a/wiki/doc/D-SI-7.11.PNG b/wiki/doc/D-SI-7.11.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..445f21573ed1b072c8bb1f3abace9131fc0f45a4
Binary files /dev/null and b/wiki/doc/D-SI-7.11.PNG differ
diff --git a/wiki/doc/D-SI-7.12.PNG b/wiki/doc/D-SI-7.12.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..60759fa95ac50340b9b0c4880dffa5dd521709e4
Binary files /dev/null and b/wiki/doc/D-SI-7.12.PNG differ
diff --git a/wiki/doc/D-SI-7.2.PNG b/wiki/doc/D-SI-7.2.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..16635e50e36d4ec02635359e8f488b80a09ac519
Binary files /dev/null and b/wiki/doc/D-SI-7.2.PNG differ
diff --git a/wiki/doc/D-SI-7.3.PNG b/wiki/doc/D-SI-7.3.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..4a5e112c469bb9d06ac7a5564aa119802f367577
Binary files /dev/null and b/wiki/doc/D-SI-7.3.PNG differ
diff --git a/wiki/doc/D-SI-7.4.PNG b/wiki/doc/D-SI-7.4.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..b619c583b309b9a415daa855368b9b012bb4c5a9
Binary files /dev/null and b/wiki/doc/D-SI-7.4.PNG differ
diff --git a/wiki/doc/D-SI-7.5.PNG b/wiki/doc/D-SI-7.5.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..27db4f5f39fca81c20cb18f845e395eeb91d02d9
Binary files /dev/null and b/wiki/doc/D-SI-7.5.PNG differ
diff --git a/wiki/doc/D-SI-7.6.PNG b/wiki/doc/D-SI-7.6.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..9adb96c1e7f6ebee7f9190eb68fbb057792a5abb
Binary files /dev/null and b/wiki/doc/D-SI-7.6.PNG differ
diff --git a/wiki/doc/D-SI-7.7.PNG b/wiki/doc/D-SI-7.7.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..3a0d1569df89135030eff622280eac3e88138d89
Binary files /dev/null and b/wiki/doc/D-SI-7.7.PNG differ
diff --git a/wiki/doc/D-SI-7.8.PNG b/wiki/doc/D-SI-7.8.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..ea326feb8b8c71475128aa9305cdaeae8d801e5a
Binary files /dev/null and b/wiki/doc/D-SI-7.8.PNG differ
diff --git a/wiki/doc/D-SI-7.9.PNG b/wiki/doc/D-SI-7.9.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..78eed70c0adea947a814db93f302b586f3a87bb5
Binary files /dev/null and b/wiki/doc/D-SI-7.9.PNG differ
diff --git a/wiki/doc/D-SI-8.1.PNG b/wiki/doc/D-SI-8.1.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..fc6f4defe6095e415922d52e1e45de53e41c6b08
Binary files /dev/null and b/wiki/doc/D-SI-8.1.PNG differ
diff --git a/wiki/doc/D-SI-8.2.PNG b/wiki/doc/D-SI-8.2.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..32f8903ec8615e63e2c223b57e794c44cc19c133
Binary files /dev/null and b/wiki/doc/D-SI-8.2.PNG differ
diff --git a/wiki/doc/D-SI-8.3.PNG b/wiki/doc/D-SI-8.3.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..05b85c559d0d42f6de9dff9844cb0cac2fd35dbd
Binary files /dev/null and b/wiki/doc/D-SI-8.3.PNG differ
diff --git a/wiki/doc/D-SI-8.4.PNG b/wiki/doc/D-SI-8.4.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..b394d68af447cfd4d9f6764e9492521d09f62596
Binary files /dev/null and b/wiki/doc/D-SI-8.4.PNG differ
diff --git a/wiki/doc/D-SI-8.5.PNG b/wiki/doc/D-SI-8.5.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..0952f0ece05a3d7f36a92cd9fcb1bdb0786bba10
Binary files /dev/null and b/wiki/doc/D-SI-8.5.PNG differ
diff --git a/wiki/doc/ExampleD-SIClassification.md b/wiki/doc/ExampleD-SIClassification.md
new file mode 100644
index 0000000000000000000000000000000000000000..88e3881e3a551ec5658cc02a984cd892d8aaaa5d
--- /dev/null
+++ b/wiki/doc/ExampleD-SIClassification.md
@@ -0,0 +1,32 @@
+# Examples: XML data with different D-SI classification
+
+The D-SI considers different classes of machine-readbility of data according to the units of measure that are used and the completenes of the metrological information. In the figure below, these classes are outlined by medals.
+
+<img alt="D-SI-Medals" width="600" style="border-width:10" src="wiki/doc/Medals.PNG" /></a>
+
+For each of the medals, the D-SI XML format comes with collections of comprehensive XML examples.
+
+
+[>> **Folder with PLATINUM examples**](examples/PLATINUM)
+
+
+[>> **Folder with GOLD examples**](examples/GOLD)
+
+
+[>> **Folder with SILVER examples**](examples/SILVER)
+
+
+[>> **Folder with BRONZE examples**](examples/BRONZE)
+
+
+[>> **Folder with IMPROVABLE examples**](examples/IMPROVABLE)
+
+---
+
+Outline of all examples: [examples/Example-Meta.md](examples/Example-Meta.md)
+
+---
+
+[**Back to Home**](wiki/d-si-online-guide.md)
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
diff --git a/wiki/doc/ExampleMonteCarloData.md b/wiki/doc/ExampleMonteCarloData.md
new file mode 100644
index 0000000000000000000000000000000000000000..9f9b03627179bb159fcd79109d3affbaa9cd43b0
--- /dev/null
+++ b/wiki/doc/ExampleMonteCarloData.md
@@ -0,0 +1,6 @@
+
+
+---
+[**Back to Home**](wiki/d-si-online-guide.md)
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
diff --git a/wiki/doc/GoodPractiseConstantsUncertainty.md b/wiki/doc/GoodPractiseConstantsUncertainty.md
new file mode 100644
index 0000000000000000000000000000000000000000..d7bd8f981246d094cc1781029c4e02643495f202
--- /dev/null
+++ b/wiki/doc/GoodPractiseConstantsUncertainty.md
@@ -0,0 +1,71 @@
+## Good Practise: Uncertainty of Constants
+
+This Good Practise example shows ways how to evaluate the uncertainty for constants in the D-SI, where the value of the constant is rounded to a finite number of digits. As an example, the value of the constant PI is considered. The representation of the value of PI in a digital system is typically a rounded value.
+
+### D-SI principle of representing rounding errors as uncertainty
+The error in rounding a mathematical constant to a finite number of decimal places should be represented by an "uncertainty". In this way, the uncertainty can be defined as the standard deviation of a rectangular distribution that contains the exact value of the constant with 100% probability. <br/>
+The user is free to define any rectangular distribution for the "uncertainty" of the rounding error as long as the statement meets the requirement above. It would for example allow very rought estimates of the uncertainty to be made. This is outlined below for the value of PI:
+
+```xml
+<si:constant>
+ <si:value>3.14</si:value>
+ <si:unit>\one</si:unit>
+ <si:uncertainty>1</si:uncertainty>
+ <si:distribution>rectangular</si:distribution>
+<si:constant>
+```
+As this is not very practical, two methods are presented below that may be more useful when looking for a more accurate assessment of the rounding error by uncertainty.
+
+### Uncertainty for constants from "half-even rounding"
+The "half-even" rounding method (sometimes called Bankers rounding) has the smallest rounding error among all rounding methods and so is a good example for good practise. The five steps below outline the application of this rounding method for PI with rounding to two digits after the decimal point.
+
+1.) Round the value of PI to two digits after the decimal point with the rounding method "half even" (number decimal places n=2) gives 3.14.
+
+2.) Calculating the maximum rounding error with the formula err = 0.5 * 10^{-n} = 0.005 (other rounding methods than the "half-even" procedure have error 10^{-n}.)
+
+3.) The interval I = [3.14 - 0.005, 3.14 + 0.005] contains the correct value of PI with 100% probability.
+
+4.) Interpretation of the interval as a rectangular distribution and calculation of the standard uncertainty u= err / sqrt{3} gives a value a little less than 0.003. Thus, using 0.003 as the value of standard uncertainty is a valid choice.
+
+5.) A trailing zero is added to the rounded value of PI giving 3.140 to have the same amount of significant decimal places for value and the standard uncertainty. Writing the data to XML gives:
+
+```xml
+<si:constant>
+ <si:value>3.140</si:value>
+ <si:unit>\one</si:unit>
+ <si:uncertainty>0.003</si:uncertainty>
+ <si:distribution>rectangular</si:distribution>
+<si:constant>
+```
+
+### Uncertainty for constants stored in differing precision formats
+
+If a more precise assessment of the rounding error is needed, this good practise guideline considers the comparison of the constants stored in differing precision formats. In the calculation below this is outlined by the evaluation of the accuracy of PI in single precision floating point format compared to PI in double precision floating point format. All calculations in this example were implemented in a simple JAVA program.
+
+1.) Construct a single precision and double precision value for PI. Then, calculate the difference of both values in double precision arithmetic:
+ * PI single precision: 3.1415927
+ * Difference to double: 8.742278012618954E-8
+
+2.) By setting d = 8.742278012618954E-8, we have defined the half width of an interval that would cover the value of PI.
+
+3.) Calculate the standard uncertainty for coverage interval that is 5.0473565639161E-8 in double precision arithmetic.
+
+4.) Optional rounding up of the standard uncertainty value to two significant digits gives u = 5.1E-8 and adding trailing zeros to the single precision value according to the number of decimal places of the uncertainty gives the XML constant:
+
+```xml
+<si:constant>
+ <si:value>3.141592700</si:value>
+ <si:unit>\one</si:unit>
+ <si:uncertainty>0.000000051</si:uncertainty>
+ <si:distribution>rectangular</si:distribution>
+<si:constant>
+```
+
+---
+
+[**Back to Home**](wiki/d-si-online-guide.md)
+
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
+
+
diff --git a/wiki/doc/GoodPractiseTempHuPre.md b/wiki/doc/GoodPractiseTempHuPre.md
new file mode 100644
index 0000000000000000000000000000000000000000..488cbafa49c26c388c2800ac19fcd15fd7640ab5
--- /dev/null
+++ b/wiki/doc/GoodPractiseTempHuPre.md
@@ -0,0 +1,16 @@
+# Good Practise: Temperature, Humidity and Pressure
+
+This good practise makes recommendations for the use of the D-SI with common measurands in practical metrological applications.
+
+
+### Temperature
+
+### Humidity
+
+### Pressure
+
+---
+
+[**Back to Home**](wiki/d-si-online-guide.md)
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
diff --git a/wiki/doc/Hybrid.md b/wiki/doc/Hybrid.md
new file mode 100644
index 0000000000000000000000000000000000000000..4fe94d97ed445d0ea2b91d1c0d165714a85e8533
--- /dev/null
+++ b/wiki/doc/Hybrid.md
@@ -0,0 +1,85 @@
+## 8. Structure for non-SI units (hybrid)
+
+<img alt="D-SI-Image-8.1" width="600" style="border-width:10" src="wiki/doc/D-SI-8.1.PNG" /></a>
+---
+<img alt="D-SI-Image-8.2" width="600" style="border-width:10" src="wiki/doc/D-SI-8.2.PNG" /></a>
+---
+<img alt="D-SI-Image-8.3" width="600" style="border-width:10" src="wiki/doc/D-SI-8.3.PNG" /></a>
+
+<details><summary><strong>Show full XML example</strong></summary>
+
+```xml
+
+<si:hybrid>
+ <!-- A: length from B converted to SI -->
+ <si:real>
+ <si:value>0.3048006</si:value>
+ <si:unit>\metre</si:unit>
+ </si:real>
+ <!-- B: length with imperial unit foot -->
+ <si:real>
+ <si:value>1</si:value>
+ <si:unit>ft(U.S. survey)</si:unit>
+ </si:real>
+</si:hybrid>
+
+```
+
+</details>
+
+---
+<img alt="D-SI-Image-8.4" width="600" style="border-width:10" src="wiki/doc/D-SI-8.4.PNG" /></a>
+---
+<img alt="D-SI-Image-8.5" width="800" style="border-width:10" src="wiki/doc/D-SI-8.5.PNG" /></a>
+
+<details><summary><strong>Show full XML example</strong></summary>
+
+```xml
+
+<si:hybrid>
+ <!-- A: list from B converted to SI -->
+ <si:realList>
+ <si:real>
+ <si:value>0.00454609</si:value>
+ <si:unit>\metre\tothe{3}</si:unit>
+ </si:real>
+ <si:real>
+ <si:label>hardness Rockwell C scale</si:label>
+ <si:value>63.00</si:value>
+ <si:unit>\metre\metre\tothe{-1}</si:unit>
+ <si:expandedUnc>
+ <si:uncertainty>1.56</si:uncertainty>
+ <si:coverageFactor>2</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ </si:expandedUnc>
+ </si:real>
+ </si:realList>
+ <!-- B: list with non-SI units -->
+ <si:realList>
+ <si:real>
+ <si:value>1</si:value>
+ <si:unit>gallon(U.K.)</si:unit>
+ </si:real>
+ <si:real>
+ <si:label>hardness Rockwell C scale</si:label>
+ <si:value>63.00</si:value>
+ <si:unit>HRC</si:unit>
+ <si:expandedUnc>
+ <si:uncertainty>1.56</si:uncertainty>
+ <si:coverageFactor>2</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ </si:expandedUnc>
+ </si:real>
+ </si:realList>
+</si:hybrid>
+
+```
+
+</details>
+
+---
+
+[**Previous Chapter 7 <<**](wiki/doc/ComplexList.md) [**Home**](wiki/d-si-online-guide.md)
+
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
diff --git a/wiki/doc/ListDataModel.md b/wiki/doc/ListDataModel.md
new file mode 100644
index 0000000000000000000000000000000000000000..2b6e529038c20268978d4bf8660c41369edb6823
--- /dev/null
+++ b/wiki/doc/ListDataModel.md
@@ -0,0 +1,88 @@
+## 5. List Data Model (general)
+
+<img alt="D-SI-Image-5.1" width="600" style="border-width:10" src="wiki/doc/D-SI-5.1.PNG" /></a>
+---
+<img alt="D-SI-Image-5.2" width="600" style="border-width:10" src="wiki/doc/D-SI-5.2.PNG" /></a>
+---
+<img alt="D-SI-Image-5.3" width="600" style="border-width:10" src="wiki/doc/D-SI-5.3.PNG" /></a>
+
+<details><summary><strong>Show full XML example (left-top)</strong></summary>
+
+```xml
+
+<si:realList>
+ <si:real>
+ <si:value>1.00</si:value>
+ <si:unit>\metre</si:unit>
+ </si:real>
+ <si:real>
+ <si:value>1.00</si:value>
+ <si:unit>\second</si:unit>
+ </si:real>
+</si:realList>
+
+```
+
+</details>
+
+<details><summary><strong>Show full XML example (left-bottom)</strong></summary>
+
+```xml
+
+<si:complexList>
+ <si:complex>
+ <si:valueReal>-10.310</si:valueReal>
+ <si:valueImag>5.010</si:valueImag>
+ <si:unit>\volt</si:unit>
+ </si:complex>
+ <si:complex>
+ <si:valueReal>-10.510</si:valueReal>
+ <si:valueImag>5.510</si:valueImag>
+ <si:unit>\volt</si:unit>
+ </si:complex>
+</si:complexList>
+
+```
+
+</details>
+
+<details><summary><strong>Show full XML example (right)</strong></summary>
+
+```xml
+
+<si:list>
+ <si:realList>
+ <si:real>
+ <si:value>2.34</si:value>
+ <si:unit>\metre</si:unit>
+ </si:real>
+ <si:real>
+ <si:value>3.34</si:value>
+ <si:unit>\metre</si:unit>
+ </si:real>
+ </si:realList>
+ <si:realList>
+ <si:real>
+ <si:value>4.34</si:value>
+ <si:unit>\metre</si:unit>
+ </si:real>
+ <si:real>
+ <si:value>5.34</si:value>
+ <si:unit>\metre</si:unit>
+ </si:real>
+ </si:realList>
+</si:list>
+
+```
+
+</details>
+
+---
+<img alt="D-SI-Image-5.4" width="600" style="border-width:10" src="wiki/doc/D-SI-5.4.PNG" /></a>
+
+---
+
+[**Previous Chapter 4 <<**](wiki/doc/ComplexQuantity.md) [**Home**](wiki/d-si-online-guide.md) [**>> Next Chapter 6**](wiki/doc/RealList.md)
+
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
diff --git a/wiki/doc/Medals.PNG b/wiki/doc/Medals.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..d21a26dc3fa24b98e976521ea4fb5930264276d1
Binary files /dev/null and b/wiki/doc/Medals.PNG differ
diff --git a/wiki/doc/RealList.md b/wiki/doc/RealList.md
new file mode 100644
index 0000000000000000000000000000000000000000..7d14e1a1bc0c5981327d53bd7b799125617677d0
--- /dev/null
+++ b/wiki/doc/RealList.md
@@ -0,0 +1,273 @@
+## 6. List of real quantities
+
+<img alt="D-SI-Image-6.1" width="800" style="border-width:10" src="wiki/doc/D-SI-6.1.PNG" /></a>
+---
+<img alt="D-SI-Image-6.2" width="600" style="border-width:10" src="wiki/doc/D-SI-6.2.PNG" /></a>
+---
+<img alt="D-SI-Image-6.3" width="600" style="border-width:10" src="wiki/doc/D-SI-6.3.PNG" /></a>
+---
+<img alt="D-SI-Image-6.4" width="600" style="border-width:10" src="wiki/doc/D-SI-6.4.PNG" /></a>
+
+<details><summary><strong>Show full XML example (left)</strong></summary>
+
+```xml
+
+<si:realList>
+ <si:real>
+ <si:value>2.34</si:value>
+ <si:unit>\metre</si:unit>
+ </si:real>
+ <si:real>
+ <si:value>3.34</si:value>
+ <si:unit>\metre</si:unit>
+ </si:real>
+ <si:real>
+ <si:value>4.34</si:value>
+ <si:unit>\metre</si:unit>
+ </si:real>
+</si:realList>
+
+```
+
+</details>
+
+<details><summary><strong>Show full XML example (right)</strong></summary>
+
+```xml
+
+<si:realList>
+ <si:listUnit>\metre</si:listUnit>
+ <si:real>
+ <si:value>2.34</si:value>
+ </si:real>
+ <si:real>
+ <si:value>3.34</si:value>
+ </si:real>
+ <si:real>
+ <si:value>4.34</si:value>
+ </si:real>
+</si:realList>
+
+```
+
+</details>
+
+---
+<img alt="D-SI-Image-6.5" width="800" style="border-width:10" src="wiki/doc/D-SI-6.5.PNG" /></a>
+---
+<img alt="D-SI-Image-6.6" width="600" style="border-width:10" src="wiki/doc/D-SI-6.6.PNG" /></a>
+---
+<img alt="D-SI-Image-6.7" width="600" style="border-width:10" src="wiki/doc/D-SI-6.7.PNG" /></a>
+
+<details><summary><strong>Show full XML example</strong></summary>
+
+```xml
+
+<si:realList>
+ <si:real>
+ <si:value>2.34</si:value>
+ <si:unit>\metre</si:unit>
+ <si:expandedUnc>
+ <si:uncertainty>0.01</si:uncertainty>
+ <si:coverageFactor>2</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal</si:distribution>
+ </si:expandedUnc>
+ </si:real>
+ <si:real>
+ <si:value>3.34</si:value>
+ <si:unit>\metre</si:unit>
+ <si:expandedUnc>
+ <si:uncertainty>0.01</si:uncertainty>
+ <si:coverageFactor>2</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal</si:distribution>
+ </si:expandedUnc>
+ </si:real>
+</si:realList>
+
+```
+
+</details>
+
+---
+<img alt="D-SI-Image-6.8" width="600" style="border-width:10" src="wiki/doc/D-SI-6.8.PNG" /></a>
+
+<details><summary><strong>Show full XML example</strong></summary>
+
+```xml
+
+<si:realList>
+ <si:listUnit>\metre</si:listUnit>
+ <si:listUnivariateUnc>
+ <si:expandedUnc>
+ <si:uncertainty>0.01</si:uncertainty>
+ <si:coverageFactor>2</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal</si:distribution>
+ </si:expandedUnc>
+ </si:listUnivariateUnc>
+ <si:real>
+ <si:value>2.34</si:value>
+ </si:real>
+ <si:real>
+ <si:value>3.34</si:value>
+ </si:real>
+</si:realList>
+
+```
+
+</details>
+
+---
+<img alt="D-SI-Image-6.9" width="800" style="border-width:10" src="wiki/doc/D-SI-6.9.PNG" /></a>
+---
+<img alt="D-SI-Image-6.10" width="800" style="border-width:10" src="wiki/doc/D-SI-6.10.PNG" /></a>
+
+<details><summary><strong>Show full XML example (left)</strong></summary>
+
+```xml
+
+<si:realList>
+ <si:real>
+ <si:value>2.340</si:value>
+ <si:unit>\metre</si:unit>
+ </si:real>
+ <si:real>
+ <si:value>3.340</si:value>
+ <si:unit>\second</si:unit>
+ </si:real>
+ <si:ellipsoidalRegion>
+ <si:covarianceMatrix>
+ <si:column>
+ <si:covariance>
+ <si:value>0.212</si:value>
+ <si:unit>\metre\metre</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.051</si:value>
+ <si:unit>\second\metre</si:unit>
+ </si:covariance>
+ </si:column>
+ <si:column>
+ <si:covariance>
+ <si:value>0.051</si:value>
+ <si:unit>\metre\second</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.101</si:value>
+ <si:unit>\second\second</si:unit>
+ </si:covariance>
+ </si:column>
+ </si:covarianceMatrix>
+ <si:coverageFactor>2.45</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal-multivariate</si:distribution>
+ </si:ellipsoidalRegion>
+</si:realList>
+
+```
+
+</details>
+
+<details><summary><strong>Show full XML example (right)</strong></summary>
+
+```xml
+
+<si:realList>
+ <si:real>
+ <si:value>2.340</si:value>
+ <si:unit>\metre</si:unit>
+ </si:real>
+ <si:real>
+ <si:value>3.340</si:value>
+ <si:unit>\second</si:unit>
+ </si:real>
+ <si:rectangularRegion>
+ <si:covarianceMatrix>
+ <si:column>
+ <si:covariance>
+ <si:value>0.212</si:value>
+ <si:unit>\metre\metre</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.051</si:value>
+ <si:unit>\second\metre</si:unit>
+ </si:covariance>
+ </si:column>
+ <si:column>
+ <si:covariance>
+ <si:value>0.051</si:value>
+ <si:unit>\metre\second</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.101</si:value>
+ <si:unit>\second\second</si:unit>
+ </si:covariance>
+ </si:column>
+ </si:covarianceMatrix>
+ <si:coverageFactor>2.24</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal-multivariate</si:distribution>
+ </si:rectangularRegion>
+</si:realList>
+
+```
+
+</details>
+
+---
+<img alt="D-SI-Image-6.11" width="800" style="border-width:10" src="wiki/doc/D-SI-6.11.PNG" /></a>
+
+<details><summary><strong>Show full XML example</strong></summary>
+
+```xml
+
+<si:realList>
+ <si:real>
+ <si:value>2.340</si:value>
+ <si:unit>\metre</si:unit>
+ </si:real>
+ <si:real>
+ <si:value>3.340</si:value>
+ <si:unit>\second</si:unit>
+ </si:real>
+ <si:ellipsoidalRegion>
+ <si:covarianceMatrix>
+ <si:column>
+ <si:covariance>
+ <si:value>0.212</si:value>
+ <si:unit>\metre\metre</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.051</si:value>
+ <si:unit>\second\metre</si:unit>
+ </si:covariance>
+ </si:column>
+ <si:column>
+ <si:covariance>
+ <si:value>0.051</si:value>
+ <si:unit>\metre\second</si:unit>
+ </si:covariance>
+ <si:covariance>
+ <si:value>0.101</si:value>
+ <si:unit>\second\second</si:unit>
+ </si:covariance>
+ </si:column>
+ </si:covarianceMatrix>
+ <si:coverageFactor>2.45</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal-multivariate</si:distribution>
+ </si:ellipsoidalRegion>
+</si:realList>
+
+```
+
+</details>
+
+---
+
+[**Previous Chapter 5 <<**](wiki/doc/ListDataModel.md) [**Home**](wiki/d-si-online-guide.md) [**>> Next Chapter 7**](wiki/doc/ComplexList.md)
+
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
diff --git a/wiki/doc/RealQuantity.md b/wiki/doc/RealQuantity.md
new file mode 100644
index 0000000000000000000000000000000000000000..3f2b4eab7ed4ce422b56682d8e28809f54d1765c
--- /dev/null
+++ b/wiki/doc/RealQuantity.md
@@ -0,0 +1,148 @@
+## 1. Real Quantities and fundamental constants
+
+<img alt="D-SI-Image-1.1" width="600" style="border-width:10" src="wiki/doc/D-SI-1.1.PNG" /></a>
+---
+<img alt="D-SI-Image-1.2" width="600" style="border-width:10" src="wiki/doc/D-SI-1.2.PNG" /></a>
+---
+<img alt="D-SI-Image-1.3" width="600" style="border-width:10" src="wiki/doc/D-SI-1.3.PNG" /></a>
+---
+<img alt="D-SI-Image-1.4" width="600" style="border-width:10" src="wiki/doc/D-SI-1.4.PNG" /></a>
+---
+<img alt="D-SI-Image-1.5" width="600" style="border-width:10" src="wiki/doc/D-SI-1.5.PNG" /></a>
+---
+<img alt="D-SI-Image-1.6" width="600" style="border-width:10" src="wiki/doc/D-SI-1.6.PNG" /></a>
+---
+<img alt="D-SI-Image-1.7" width="600" style="border-width:10" src="wiki/doc/D-SI-1.7.PNG" /></a>
+---
+<img alt="D-SI-Image-1.8" width="600" style="border-width:10" src="wiki/doc/D-SI-1.8.PNG" /></a>
+<img alt="D-SI-Image-1.9" width="600" style="border-width:10" src="wiki/doc/D-SI-1.9.PNG" /></a>
+---
+<img alt="D-SI-Image-1.10" width="600" style="border-width:10" src="wiki/doc/D-SI-1.10.PNG" /></a>
+---
+<img alt="D-SI-Image-1.11" width="600" style="border-width:10" src="wiki/doc/D-SI-1.11.PNG" /></a>
+
+<details><summary><strong>Show full XML example (top)</strong></summary>
+
+```xml
+
+<si:real>
+ <si:label>temperature</si:label>
+ <si:value>20.10</si:value>
+ <si:unit>\degreecelsius</si:unit>
+ <si:expandedUnc>
+ <si:uncertainty>0.50</si:uncertainty>
+ <si:coverageFactor>2</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal</si:distribution>
+ </si:expandedUnc>
+</si:real>
+
+```
+
+</details>
+
+<details><summary><strong>Show full XML example (bottom)</strong></summary>
+
+```xml
+
+<si:real>
+ <si:label>temperature</si:label>
+ <si:value>20.10</si:value>
+ <si:unit>\degreecelsius</si:unit>
+ <si:coverageInterval>
+ <si:standardUnc>0.25</si:standardUnc>
+ <si:intervalMin>19.60</si:intervalMin>
+ <si:intervalMax>20.60</si:intervalMax>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal</si:distribution>
+ </si:coverageInterval>
+</si:real>
+
+```
+
+</details>
+
+---
+<img alt="D-SI-Image-1.12" width="600" style="border-width:10" src="wiki/doc/D-SI-1.12.PNG" /></a>
+
+<details><summary><strong>Show full XML example</strong></summary>
+
+```xml
+
+<si:real>
+ <si:label>temperature</si:label>
+ <si:value>20.10</si:value>
+ <si:unit>\degreecelsius</si:unit>
+ <si:coverageInterval>
+ <si:standardUnc>0.25</si:standardUnc>
+ <si:intervalMin>19.60</si:intervalMin>
+ <si:intervalMax>20.60</si:intervalMax>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal</si:distribution>
+ </si:coverageInterval>
+</si:real>
+
+```
+
+</details>
+
+---
+<img alt="D-SI-Image-1.13" width="600" style="border-width:10" src="wiki/doc/D-SI-1.13.PNG" /></a>
+---
+<img alt="D-SI-Image-1.14" width="600" style="border-width:10" src="wiki/doc/D-SI-1.14.PNG" /></a>
+
+<details><summary><strong>Show full XML example (top)</strong></summary>
+
+```xml
+
+<si:constant>
+ <si:label>pi</si:label>
+ <si:value>3.140</si:value>
+ <si:unit>\one</si:unit>
+ <si:uncertainty>0.003</si:uncertainty>
+ <si:distribution>rectangular</si:distribution>
+</si:constant>
+
+```
+
+</details>
+
+<details><summary><strong>Show full XML example (middle)</strong></summary>
+
+```xml
+
+<si:constant>
+ <si:label>planck constant</si:label>
+ <si:value>6.626070040e-34</si:value>
+ <si:unit>\kilogram\metre\tothe{2}\second\tothe{-1}</si:unit>
+ <si:dateTime>2018-11-16T12:30:01.67-01:00</si:dateTime>
+ <si:uncertainty>8.1e-42</si:uncertainty>
+ <si:distribution>normal</si:distribution>
+</si:constant>
+
+```
+
+</details>
+
+<details><summary><strong>Show full XML example (bottom)</strong></summary>
+
+```xml
+
+<si:constant>
+ <si:label>planck constant</si:label>
+ <si:value>6.62607015e-34</si:value>
+ <si:unit>\kilogram\metre\tothe{2}\second\tothe{-1}</si:unit>
+ <si:dateTime>2019-05-21T02:00:00.10-01:00</si:dateTime>
+</si:constant>
+
+```
+
+</details>
+
+---
+
+[**Home**](wiki/d-si-online-guide.md) [**>> Next Chapter 2**](wiki/doc/StructureSIUnits.md)
+
+
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
diff --git a/wiki/doc/SmartCom_D-SI_v1.3.pdf b/wiki/doc/SmartCom_D-SI_v1.3.pdf
deleted file mode 100644
index ad93a8e16367621326e3acbea3c39c76efd11482..0000000000000000000000000000000000000000
Binary files a/wiki/doc/SmartCom_D-SI_v1.3.pdf and /dev/null differ
diff --git a/wiki/doc/StructureSIUnits.md b/wiki/doc/StructureSIUnits.md
new file mode 100644
index 0000000000000000000000000000000000000000..5aa35297d5e801a96bd81ab182e2cfda858ae503
--- /dev/null
+++ b/wiki/doc/StructureSIUnits.md
@@ -0,0 +1,23 @@
+## 2. Structure for SI Units
+
+<img alt="D-SI-Image-2.1" width="600" style="border-width:10" src="wiki/doc/D-SI-2.1.PNG" /></a>
+---
+<img alt="D-SI-Image-2.2" width="600" style="border-width:10" src="wiki/doc/D-SI-2.2.PNG" /></a>
+---
+<img alt="D-SI-Image-2.3" width="600" style="border-width:10" src="wiki/doc/D-SI-2.3.PNG" /></a>
+---
+<img alt="D-SI-Image-2.4" width="600" style="border-width:10" src="wiki/doc/D-SI-2.4.PNG" /></a>
+---
+<img alt="D-SI-Image-2.5" width="600" style="border-width:10" src="wiki/doc/D-SI-2.5.PNG" /></a>
+---
+<img alt="D-SI-Image-2.6" width="600" style="border-width:10" src="wiki/doc/D-SI-2.6.PNG" /></a>
+---
+<img alt="D-SI-Image-2.7" width="600" style="border-width:10" src="wiki/doc/D-SI-2.7.PNG" /></a>
+---
+
+
+[**Previous Chapter 1 <<**](wiki/doc/RealQuantity.md) [**Home**](wiki/d-si-online-guide.md) [**>> Next Chapter 3**](wiki/doc/CoverageRegions.md)
+
+
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
diff --git a/wiki/examples/.gitkeep b/wiki/examples/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/wiki/examples/comp/.gitkeep b/wiki/examples/comp/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/wiki/examples/comp/coverageFactor.md b/wiki/examples/comp/coverageFactor.md
deleted file mode 100644
index 949f097d01cf5a59410e76ec7150a72050b5eca6..0000000000000000000000000000000000000000
--- a/wiki/examples/comp/coverageFactor.md
+++ /dev/null
@@ -1,10 +0,0 @@
-### Component “coverageFactor”:
-The expanded measurement uncertainty (component “uncertainty”) is calculated from the
-standard uncertainty of the underlying real measurement by
-multiplication with an expansion factor. The value of the
-expansion factor is provided by the component
-“coverageFactor”. The data format for the coverage factor is
-the decimal format of the component “value”. Values smaller
-than 1 are not permitted.
-Note: The value of the standard uncertainty is accessed by
-dividing “uncertainty” by “coverageFactor”.
\ No newline at end of file
diff --git a/wiki/examples/comp/coverageProbability.md b/wiki/examples/comp/coverageProbability.md
deleted file mode 100644
index 6c6ea5b3e47594acaf178a58084fee33ac975a69..0000000000000000000000000000000000000000
--- a/wiki/examples/comp/coverageProbability.md
+++ /dev/null
@@ -1,7 +0,0 @@
-### Component “coverageProbability”:
-
-This component specifies the coverage probability
-with which the uncertainty covers the distribution
-of the measurand. It is a decimal value based on the
-component “value”. Values less than 0 or greater than 1
-are not permitted.
\ No newline at end of file
diff --git a/wiki/examples/comp/dateTime.md b/wiki/examples/comp/dateTime.md
deleted file mode 100644
index 5dc827d8d028967b68d851729ebc82e37f93a08a..0000000000000000000000000000000000000000
--- a/wiki/examples/comp/dateTime.md
+++ /dev/null
@@ -1,7 +0,0 @@
-### Component “dateTime”:
-
-This element is used to assign a time
-stamp for the measurement to the quantity value. All time
-stamps must be recorded in legal local time with a difference
-(offset) to the Universal Coordinated World Time (UTC). The
-extended UTC format from ISO 8601 2004 is used for implementation.
\ No newline at end of file
diff --git a/wiki/examples/comp/distribution.md b/wiki/examples/comp/distribution.md
deleted file mode 100644
index 23066c3b7035be671d389de80ccc62f2901d3ae2..0000000000000000000000000000000000000000
--- a/wiki/examples/comp/distribution.md
+++ /dev/null
@@ -1,9 +0,0 @@
-### Component “distribution”:
-If further information on the type
-of the distribution of the measurand is available, this
-information can be specified with the optional component
-“distribution”. This component must be written as a UTF-8
-encoded string. If the “distribution” component is not
-provided, then, as a default, real quantities shall be
-interpreted as random variable with a normal distribution
-(commonly called Gaussian distribution).
\ No newline at end of file
diff --git a/wiki/examples/comp/intervalMax.md b/wiki/examples/comp/intervalMax.md
deleted file mode 100644
index c7dd8cf08069b01b90fc32a7442dd5f1b8a908a2..0000000000000000000000000000000000000000
--- a/wiki/examples/comp/intervalMax.md
+++ /dev/null
@@ -1,13 +0,0 @@
-### Component “intervalMax”:
-This component specifies the
-value of the upper limit of a coverage interval for the
-measurement uncertainty. The value of the upper limit always
-refers to the unit defined under “unit” of the underlying real
-quantity. Its specification is mandatory
-together with the component “intervallMin”. It must be
-greater than the value of the lower interval limit
-“intervalMin”. The interval defined by the lower and upper
-limits of the interval contains values of the measurand
-probability “coverageProbability”.
-The format for the component is a decimal value of the same
-type as the component “value”.
\ No newline at end of file
diff --git a/wiki/examples/comp/intervalMin.md b/wiki/examples/comp/intervalMin.md
deleted file mode 100644
index 4b5b39067b2d170dce6314014519a7b146eac006..0000000000000000000000000000000000000000
--- a/wiki/examples/comp/intervalMin.md
+++ /dev/null
@@ -1,13 +0,0 @@
-### Component “intervalMin”:
-This component specifies the
-value of the lower limit of a coverage interval for the
-measurement uncertainty. The value of the lower limit always
-refers to the unit defined under component “unit” of the
-underlying real quantity. Its specification
-together with the component “intervallMax” is mandatory. It
-must be smaller than the value of the interval upper limit
-“intervalMax”. The interval defined by the lower and upper
-limits of the interval contains values of the measurand
-probability “coverageProbability”.
-The format for the component is a decimal value of the same
-type as the component “value”.
\ No newline at end of file
diff --git a/wiki/examples/comp/label.md b/wiki/examples/comp/label.md
deleted file mode 100644
index dc4bed0ed0678eeb81981d6cf17e31d8e5487435..0000000000000000000000000000000000000000
--- a/wiki/examples/comp/label.md
+++ /dev/null
@@ -1,6 +0,0 @@
-### Component “lable”:
-A label can optionally be assigned to the
-metrological data of the atomic quantity. Labels can provide
-information on the kind of measurement and/or the name of
-the quantity. As with the unit, it must be a UTF-8 compatible
-string.
\ No newline at end of file
diff --git a/wiki/examples/comp/standardUnc.md b/wiki/examples/comp/standardUnc.md
deleted file mode 100644
index 101b5c5fe5e7577d2c456d248d1425cbd71d9cba..0000000000000000000000000000000000000000
--- a/wiki/examples/comp/standardUnc.md
+++ /dev/null
@@ -1,8 +0,0 @@
-### Component “standardUnc”:
-This component provides the
-standard uncertainty value of the underlying real measurand.
-Its value is assigned with the unit (component “unit”) of the
-measured value. The value type of “standardUnc” is a positive decimal number. Its definition is a
-restricted variant of the decimal number format of the
-component “value” that prohibits the sign minus (“-”) for the
-mantissa.
\ No newline at end of file
diff --git a/wiki/examples/comp/uncertainty.md b/wiki/examples/comp/uncertainty.md
deleted file mode 100644
index 2a4c598c7182aa5e13c931b677d3b91127e12391..0000000000000000000000000000000000000000
--- a/wiki/examples/comp/uncertainty.md
+++ /dev/null
@@ -1,13 +0,0 @@
-### Component “uncertainty”:
-
-The value of “uncertainty” provides the half width of the coverage interval that is defined
-by the expanded measurement uncertainty. The coverage
-interval shall cover the part of the distribution of the
-underlying real measurement value according to the coverage
-probability value from the component “coverageProbability”.
-The unit of the “uncertainty” value is the same unit as defined
-for the underlying real quantity in component “unit”.
-The value type of “uncertainty” is a positive
-decimal number. Its definition is a restricted variant of the
-decimal number format of the component “value” that
-prohibits the sign minus (“-”) for the mantissa.
\ No newline at end of file
diff --git a/wiki/examples/comp/unit.md b/wiki/examples/comp/unit.md
deleted file mode 100644
index ba6ed510c544b1940cd018562d43f2f33488086f..0000000000000000000000000000000000000000
--- a/wiki/examples/comp/unit.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Component “unit”:
-
-The unit must be a UTF-8 compatible string. A high level of machine readability of the unit
-is gained when using only SI-base units and combinations of SI-base units. A SI unit format
-that is fit for this purpose is presented in [Section 3](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/blob/feat-online-guide/wiki/doc/SmartCom_D-SI_v1.3.pdf).
\ No newline at end of file
diff --git a/wiki/examples/comp/value.md b/wiki/examples/comp/value.md
deleted file mode 100644
index d2aff2f8c308d0c7b4a9485549d5a7c1e13118b8..0000000000000000000000000000000000000000
--- a/wiki/examples/comp/value.md
+++ /dev/null
@@ -1,9 +0,0 @@
-### Component “value”:
-The numerical value of the quantity must be provided. It must be written as a decimal
-floating-point number, which consists of a sign, the mantissa, an exponent separator, and
-a value for the exponent. Both the sign and the parts of the exponent are optional.
-The signs “+” and “-” are allowed. The mantissa comprises the digits “0” to “9”. It may also
-contain the dot “.” as a decimal separator. The dot can be anywhere before, after or within the mantissa.
-The exponent separator is “e” or “E”. The exponent value is an integer with the digits “0” to “9”. It can optionally
-have the sign “+” or “-”. The value must not contain blank spaces and it is
-recommended to write the mantissa and the exponent without leading zeros.
\ No newline at end of file
diff --git a/wiki/examples/complex_example.md b/wiki/examples/complex_example.md
deleted file mode 100644
index 00c541aa67e813a7e311fe8e6a933517fbcce9ec..0000000000000000000000000000000000000000
--- a/wiki/examples/complex_example.md
+++ /dev/null
@@ -1,24 +0,0 @@
-### si:compex Examples
-
-<!--##### The example shows complex quantities. The quantity value is expressed by the [si:value]() element and the [si:unit element. Optional elements are [si:label]() , [si:dateTime]() element, [si:uncertainty]() element, and [si:distribution]() element.-->
-
-<!--<img src="pic/real1.png" alt="" width=""/>-->
-
-<!--```xml
-<si:constant>
- <si:label>Planck constant</si:label>
- <si:value>6.626070040e-34</si:value>
- <si:unit>\kilogram\metre\tothe{2}\second\tothe{-1}</si:unit>
- <si:dateTime>2019-11-16T12:30:01.67-01:00</si:dateTime>
- <si:uncertainty>8.1e-42</si:uncertainty>
- <si:distribution>normal</si:distribution>
-</si:constant>
-```-->
-
-##### The XSD scheme for the [si:complex]() is presented below. The solid lines of the frame represents mandatory requirements, while the dashed lines of the frame represent optional requirements.
-
-<img src="pic/compex_xds.png" alt="" width=""/>
-
-##### More detailed description is presented in Chapter 4 in the online document [[3](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/blob/feat-online-guide/wiki/doc/SmartCom_D-SI_v1.3.pdf)].
-
-[back to home](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/tree/feat-online-guide/wiki/d-si-online-guide.md)
\ No newline at end of file
diff --git a/wiki/examples/constant_example.md b/wiki/examples/constant_example.md
deleted file mode 100644
index 4b2a9487e54be2b3bbc99cad55673f9ba06567f9..0000000000000000000000000000000000000000
--- a/wiki/examples/constant_example.md
+++ /dev/null
@@ -1,57 +0,0 @@
-### si:constant Examples
-
-
-##### The “constant” quantity data model has the same basic structure as the atomic “real” quantity. This comprises the mandatory statement of a “value” component together with the associated “unit” component.
-##### The “label” component is used to identify the constant. The “dataTime” component is of great importance for the definition of fundamental physical constants. The latest values of these fundamental constants are regularly published by CODATA [[4]](https://physics.nist.gov/cuu/pdf/wall_2018.pdf). The “dateTime” element allows to identify to which release of CODATA the constant is associated.
-##### The constants are distinguished into those constants with an exact numerical value and constants with an uncertainty attributed to the numerical value. The uncertainty value is implemented as component “uncertainty” in the constant data model. Its value refers to the unit element that is also valid for the value element.
-<!--The quantity value is expressed by the [si:value](comp/value.md) element and the [si:unit](comp/unit.md) element. Optional elements are [si:label](comp/label.md), [si:dateTime](comp/dateTime.md) element, [si:uncertainty](comp/uncertainty.md) element, and [si:distribution](comp/distribution.md) element.-->
-##### Note: The definition of uncertainty, datetime and distribution differ from those in [si:real](real_example.md).
-
-##### Additional information relevant for uncertainty definition of [si:constant](constant_example.md)
-The value of the “uncertainty” component shall provide the standard deviation for values from CODATA. In addition, the distribution of the uncertainty, if known, can be provided in the component “distribution”.
-
-Mathematical constants play a special role. Numbers like pi or the Euler number are irrational numbers. They require rounding to a finite number of digits for a machine representation. The rounding leads to a rounding error that shall be expressed by a rectangular distribution that contains the true value of the constant with 100% probability. The rectangular distribution shall be centred at the numerical value that is provided by the element value. The component “uncertainty” shall give the standard uncertainty value of the rectangular distribution.
-
-##### Additional information relevant for dateTime of [si:constant](constant_example.md)
-The “dataTime” component is of great importance for the definition of fundamental physical constants. The latest values of these fundamental constants are regularly published by CODATA the constant is associated.
-
-##### Additional information for distribution of [si:constant](constant_example.md)
-The distribution component is defined with the text “rectangular” indicating an uncertainty for a rectangular distributed quantity.
-
-##### The two examples show Planck constant in two different representaions.
-
-```xml
-<si:constant>
- <si:label>Planck constant</si:label>
- <si:value>6.62607015e-34</si:value>
- <si:unit>\joule\hertz\tothe{-1}</si:unit>
- <si:dateTime>2019-05-20T00:00:00Z</si:dateTime>
- <si:uncertainty>0</si:uncertainty>
-</si:constant>
-```
-```xml
-<si:constant>
- <si:label>Planck constant</si:label>
- <si:value>6.62607015e-34</si:value>
- <si:unit>\joule\hertz\tothe{-1}</si:unit>
- <si:dateTime>2019-05-20T00:00:00Z</si:dateTime>
- <si:uncertainty>8.1e-42</si:uncertainty>
- <si:distribution>normal</si:distribution>
-</si:constant>
-```
-##### The example shows PI in the singel precision format.
-```xml
-<si:constant>
- <si:label>pi in single precision format</si:label>
- <si:value>3.1415927</si:value>
- <si:unit>\one</si:unit>
- <si:uncertainty>0.000000051</si:uncertainty>
- <si:distribution>rectangular</si:distribution>
-</si:constant>
-```
-
-##### The XSD scheme for the [si:constant](constant_example.md) is presented below. The solid lines of the frame represents mandatory requirements, while the dashed lines of the frame represent optional requirements.
-
-<img src="pic/planckconst_xsd.png" alt="" width=""/>
-
-[back to home](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/tree/feat-online-guide/wiki/d-si-online-guide.md)
\ No newline at end of file
diff --git a/wiki/examples/hybrid_example.md b/wiki/examples/hybrid_example.md
deleted file mode 100644
index 25b8d042afe81bdcf47ab3af42b6c87910a2f83d..0000000000000000000000000000000000000000
--- a/wiki/examples/hybrid_example.md
+++ /dev/null
@@ -1,24 +0,0 @@
-### si:hybrid Examples
-
-<!--##### The example shows complex quantities. The quantity value is expressed by the [si:value]() element and the [si:unit element. Optional elements are [si:label]() , [si:dateTime]() element, [si:uncertainty]() element, and [si:distribution]() element.-->
-
-<!--<img src="pic/real1.png" alt="" width=""/>-->
-
-<!--```xml
-<si:constant>
- <si:label>Planck constant</si:label>
- <si:value>6.626070040e-34</si:value>
- <si:unit>\kilogram\metre\tothe{2}\second\tothe{-1}</si:unit>
- <si:dateTime>2019-11-16T12:30:01.67-01:00</si:dateTime>
- <si:uncertainty>8.1e-42</si:uncertainty>
- <si:distribution>normal</si:distribution>
-</si:constant>
-```-->
-
-##### The XSD scheme for the [si:hybrid](hybrid_example.md) is presented below. The solid lines of the frame represents mandatory requirements, while the dashed lines of the frame represent optional requirements.
-
-<img src="pic/hybrid_xds.png" alt="" width=""/>
-
-##### More detailed description is presented in Chapter 8 in the online document [[3](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/blob/feat-online-guide/wiki/doc/SmartCom_D-SI_v1.3.pdf)].
-
-[back to home](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/tree/feat-online-guide/wiki/d-si-online-guide.md)
\ No newline at end of file
diff --git a/wiki/examples/list_example.md b/wiki/examples/list_example.md
deleted file mode 100644
index 67744d6a5263bc246f48df9e4eb89413726bc12f..0000000000000000000000000000000000000000
--- a/wiki/examples/list_example.md
+++ /dev/null
@@ -1,24 +0,0 @@
-### si:list Examples
-
-<!--##### The example shows complex quantities. The quantity value is expressed by the [si:value]() element and the [si:unit element. Optional elements are [si:label]() , [si:dateTime]() element, [si:uncertainty]() element, and [si:distribution]() element.-->
-
-<!--<img src="pic/real1.png" alt="" width=""/>-->
-
-<!--```xml
-<si:constant>
- <si:label>Planck constant</si:label>
- <si:value>6.626070040e-34</si:value>
- <si:unit>\kilogram\metre\tothe{2}\second\tothe{-1}</si:unit>
- <si:dateTime>2019-11-16T12:30:01.67-01:00</si:dateTime>
- <si:uncertainty>8.1e-42</si:uncertainty>
- <si:distribution>normal</si:distribution>
-</si:constant>
-```-->
-
-##### The XSD scheme for the [si:list](list_example.md) is presented below. The solid lines of the frame represents mandatory requirements, while the dashed lines of the frame represent optional requirements.
-
-<img src="pic/list_xds.png" alt="" width=""/>
-
-##### More detailed description is presented in Chapters 6 and 7 in the online document [[3](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/blob/feat-online-guide/wiki/doc/SmartCom_D-SI_v1.3.pdf)].
-
-[back to home](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/tree/feat-online-guide/wiki/d-si-online-guide.md)
\ No newline at end of file
diff --git a/wiki/examples/pic/.gitkeep b/wiki/examples/pic/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/wiki/examples/pic/compex_xds.png b/wiki/examples/pic/compex_xds.png
deleted file mode 100644
index 61288d3c4c667ece04bf38f7508c926bed498006..0000000000000000000000000000000000000000
Binary files a/wiki/examples/pic/compex_xds.png and /dev/null differ
diff --git a/wiki/examples/pic/hybrid_xds.png b/wiki/examples/pic/hybrid_xds.png
deleted file mode 100644
index c069ad735361d342680d6484f7e77e114f7113d8..0000000000000000000000000000000000000000
Binary files a/wiki/examples/pic/hybrid_xds.png and /dev/null differ
diff --git a/wiki/examples/pic/list_xds.png b/wiki/examples/pic/list_xds.png
deleted file mode 100644
index 9b55c57a0cf31b3ca8d5a05385c18fc0aa23949d..0000000000000000000000000000000000000000
Binary files a/wiki/examples/pic/list_xds.png and /dev/null differ
diff --git a/wiki/examples/pic/planckconst_xsd.png b/wiki/examples/pic/planckconst_xsd.png
deleted file mode 100644
index 816cdd8bcce44d8734c8da404b46b4c8e917002f..0000000000000000000000000000000000000000
Binary files a/wiki/examples/pic/planckconst_xsd.png and /dev/null differ
diff --git a/wiki/examples/pic/real1.png b/wiki/examples/pic/real1.png
deleted file mode 100644
index cc883c1e301cf55c05ed793864865dd1769007f9..0000000000000000000000000000000000000000
Binary files a/wiki/examples/pic/real1.png and /dev/null differ
diff --git a/wiki/examples/pic/real2.png b/wiki/examples/pic/real2.png
deleted file mode 100644
index bbad6bd63ad33e24eb95f9364a1a44e039c7b04d..0000000000000000000000000000000000000000
Binary files a/wiki/examples/pic/real2.png and /dev/null differ
diff --git a/wiki/examples/pic/real3.png b/wiki/examples/pic/real3.png
deleted file mode 100644
index c03630a09e20c535708c2cb310b05450d2f68b24..0000000000000000000000000000000000000000
Binary files a/wiki/examples/pic/real3.png and /dev/null differ
diff --git a/wiki/examples/pic/real4.png b/wiki/examples/pic/real4.png
deleted file mode 100644
index 68acb362115d0522fdf29562402e6cca1d2424ef..0000000000000000000000000000000000000000
Binary files a/wiki/examples/pic/real4.png and /dev/null differ
diff --git a/wiki/examples/pic/real_xds.png b/wiki/examples/pic/real_xds.png
deleted file mode 100644
index 3116ee642dc221eb7313ca8c1b2f0777c8ae737b..0000000000000000000000000000000000000000
Binary files a/wiki/examples/pic/real_xds.png and /dev/null differ
diff --git a/wiki/examples/real_example.md b/wiki/examples/real_example.md
deleted file mode 100644
index c90348c084ac0e475a2f53aed22540d5be1cfbf4..0000000000000000000000000000000000000000
--- a/wiki/examples/real_example.md
+++ /dev/null
@@ -1,67 +0,0 @@
-### si:real Examples
-
-##### The example shows temperature measurment. The quantity value is expressed by the [si:value](comp/value.md) element and the [si:unit](comp/unit.md) element.
-
-<!--<img src="pic/real1.png" alt="" width=""/>-->
-
-```xml
-<si:real>
- <si:value>293</si:value>
- <si:unit>\kelvin</si:unit>
-</si:real>
-```
-
-##### The example shows temperature measurment. The quantity value is expressed by the [si:value](comp/value.md) element and the [si:unit](comp/unit.md) element. Optional elements are [si:label](comp/label.md) and [si:dateTime](comp/dateTime.md).
-
-<!--<img src="pic/real2.png" alt="" width=""/>-->
-
-```xml
-<si:real>
- <si:label>temperature</si:label>
- <si:value>20.10</si:value>
- <si:unit>\degreecelsius</si:unit>
- <si:dateTime>2019-11-16T12:30:01.67-01:00</si:dateTime>
-</si:real>
-```
-
-##### The example shows a temperature measurement with a coverage interval. The quantity value is expressed by the [si:value](comp/value.md) element and the [si:unit](comp/unit.md) element. Optional elements are [si:label](comp/label.md) and [si:dateTime](comp/dateTime.md). The sub type si:coverageInterval is expressed by the [si:standardUnc](comp/standardUnc.md) element, [si:intervalMin](comp/intervalMin.md) element, [si:intervalMax](comp/intervalMax.md) element, [si:coverageProbability](comp/coverageProbability.md) element and optinal [si: distribution](comp/distribution.md) element.
-
-<!--<img src="pic/real3.png" alt="" width=""/>-->
-```xml
-<si:real>
- <si:label>temperature</si:label>
- <si:value>20.10</si:value>
- <si:unit>\degreecelsius</si:unit>
- <si:coverageInterval>
- <si:standardUnc>0.25</si:standardUnc>
- <si:intervalMin>19.60</si:intervalMin>
- <si:intervalMax>20.60</si:intervalMax>
- <si:coverageProbability>0.95</si:coverageProbability>
- <si:distribution>normal</si:distribution>
- </si:coverageInterval>
-</si:real>
-```
-
-##### The example shows a temperature measurement with an expanded measurement uncertainty. The quantity value is expressed by the [si:value](comp/value.md) element and the [si:unit](comp/unit.md) element. Optional elements is [si:label](comp/label.md). The sub type si:expandedUnc is expressed by the [si:uncertainty](comp/uncertainty.md) element, [si:coverageFactor](comp/coverageFactor.md) element, [si:coverageProbability](comp/coverageProbability.md) element, and optinal [si:distribution](comp/distribution.md) element.
-
-<!--<img src="pic/real4.png" alt="" width=""/>-->
-```xml
-<si:real>
- <si:label>temperature</si:label>
- <si:value>20.10</si:value>
- <si:unit>\degreecelsius</si:unit>
- <si:expandedUnc>
- <si:uncertainty>0.50</si:uncertainty>
- <si:coverageFactor>2</si:coverageFactor>
- <si:coverageProbability>0.95</si:coverageProbability>
- <si:distribution>normal</si:distribution>
- </si:expandedUnc>
-</si:real>
-```
-
-
-##### The XSD scheme for the [si:real](real_example.md) is presented below. The solid lines of the frame represents mandatory requirements, while the dashed lines of the frame represent optional requirements.
-
-<img src="pic/real_xds.png" alt="" width=""/>
-
-[back to home](https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si/tree/feat-online-guide/wiki/d-si-online-guide.md)