Skip to content
Snippets Groups Projects
Commit 8bedc272 authored by Justin Jagieniak's avatar Justin Jagieniak
Browse files

Merge branch 'xml-lists' of https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si into xml-lists

parents 3fc99ff4 acfc36e3
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 110 additions and 27 deletions
README.md
+ 4
− 4
View file @ 8bedc272
<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
XSD Version 2.1.0
<br /><br />
</div>
......@@ -34,13 +34,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## Access to D-SI XSD version 2.0.0
## Access to D-SI XSD version 2.1.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)
* D-SI XSD version 2.1.0 @ [https://www.ptb.de/si/v2.0.0/SI_Format.xsd](https://www.ptb.de/si/v2.1.0/SI_Format.xsd)
* Latest D-SI XSD version @ [https://www.ptb.de/si/SI_Format.xsd](https://www.ptb.de/si/SI_Format.xsd)
* 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)
* 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.1.0/examples/SI_Format_TestData.xsd)
## Development
......
SI_Format.xsd
+ 5
− 5
View file @ 8bedc272
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema version="2.0.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
<xs:schema version="2.1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="https://ptb.de/si"
xmlns:si="https://ptb.de/si"
elementFormDefault="qualified">
......@@ -23,8 +23,8 @@
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
D-SI XSD VERSION: 2.1.0
RELEASE DATA: 2021-mm-dd
DOI: 10.5281/zenodo.4709001
</xs:documentation>
<xs:documentation xml:lang="en">
......@@ -725,7 +725,7 @@
<xs:element name="uncertaintyXMLList" type="si:uncertaintyValueXMLListType"/>
<xs:element name="coverageFactorXMLList" type="si:kValueXMLListType"/>
<xs:element name="coverageProbabilityXMLList" type="si:probabilityValueXMLListType"/>
<xs:element name="distribution" type="si:stringXMLListType" minOccurs="0"/>
<xs:element name="distributionXMLList" type="si:stringXMLListType" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
......@@ -747,7 +747,7 @@
<xs:element name="intervalMinXMLList" type="si:decimalXMLListType"/>
<xs:element name="intervalMaxXMLList" type="si:decimalXMLListType"/>
<xs:element name="coverageProbabilityXMLList" type="si:probabilityValueXMLListType"/>
<xs:element name="distribution" type="si:stringXMLListType" minOccurs="0"/>
<xs:element name="distributionXMLList" type="si:stringXMLListType" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
......
examples/GOLD/2021-10-26-GOLD-examples-xmllists.xml
+ 22
− 1
View file @ 8bedc272
......@@ -39,7 +39,7 @@
<si:uncertaintyXMLList>0.01</si:uncertaintyXMLList>
<si:coverageFactorXMLList>2</si:coverageFactorXMLList>
<si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList>
<si:distribution>normal</si:distribution>
<si:distributionXMLList>normal</si:distributionXMLList>
</si:expandedUncXMLList>
</si:realListXMLList>
</siTest:testData>
......@@ -58,4 +58,25 @@
</si:realListXMLList>
</siTest:testData>
<siTest:testData id="DCC-GP3">
<si:realListXMLList>
<si:valueXMLList>33 100 175 250 320</si:valueXMLList>
<si:unitXMLList>\degreecelsius</si:unitXMLList>
</si:realListXMLList>
</siTest:testData>
<siTest:testData id="DCC-GP4">
<si:realListXMLList>
<si:valueXMLList>33.095 99.977 175.099 250.171 320.001</si:valueXMLList>
<si:unitXMLList>\degreecelsius</si:unitXMLList>
<si:dateTimeXMLList>1957-08-13T08:15:00Z 1957-08-13T09:15:00Z 1957-08-13T10:15:00Z 1957-08-13T11:15:00Z 1957-08-13T12:15:00Z</si:dateTimeXMLList>
<si:expandedUncXMLList>
<si:uncertaintyXMLList>0.005</si:uncertaintyXMLList>
<si:coverageFactorXMLList>2</si:coverageFactorXMLList>
<si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList>
<si:distributionXMLList>rectangle</si:distributionXMLList>
</si:expandedUncXMLList>
</si:realListXMLList>
</siTest:testData>
</siTest:testDSIXML>
\ No newline at end of file
examples/IMPROVABLE/2021-11-23-IMPROVABLE-examples-xmllists.xml 0 → 100644
+ 44
− 0
View file @ 8bedc272
<?xml version="1.0" encoding="UTF-8"?>
<siTest:testDSIXML
xmlns:siTest="https://ptb.de/si/examples"
xmlns:si="https://ptb.de/si"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://ptb.de/si/examples ../SI_Format_TestData.xsd">
<!--
Copyright (c) 2021 Physikalisch-Technische Bundesanstalt (PTB), all rights reserved.
AUTHORS: Justin Jagieniak, Benjamin Glogeer
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
D-SI XSD VERSION: 2.1.0-RC1
RELEASE DATA: 2021-10-26
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 (D-SI XSD version 2.1.0-RC1)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="PTB242-XMLList-b">
<si:realListXMLList>
<si:valueXMLList>1.0</si:valueXMLList>
<si:unitXMLList>\kelvin \tonne</si:unitXMLList>
</si:realListXMLList>
</siTest:testData>
</siTest:testDSIXML>
\ No newline at end of file
examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml
+ 28
− 2
View file @ 8bedc272
......@@ -60,7 +60,7 @@
<si:uncertaintyXMLList>2.0</si:uncertaintyXMLList>
<si:coverageFactorXMLList>1.96</si:coverageFactorXMLList>
<si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList>
<si:distribution>rectangular</si:distribution>
<si:distributionXMLList>rectangular</si:distributionXMLList>
</si:expandedUncXMLList>
</si:realListXMLList>
</siTest:testData>
......@@ -85,5 +85,31 @@
</si:realListXMLList>
</siTest:testData>
<siTest:testData id="DCC-GP1">
<si:realListXMLList>
<si:valueXMLList>-1.55 -1.55 -1.55 -2.05 -2.05</si:valueXMLList>
<si:unitXMLList>\kelvin</si:unitXMLList>
</si:realListXMLList>
</siTest:testData>
<siTest:testData id="DCC-GP2">
<si:realListXMLList>
<si:valueXMLList>0.105 0.323 -0.199 -0.271 0.199</si:valueXMLList>
<si:unitXMLList>\kelvin</si:unitXMLList>
<si:expandedUncXMLList>
<si:uncertaintyXMLList>0.89</si:uncertaintyXMLList>
<si:coverageFactorXMLList>2</si:coverageFactorXMLList>
<si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList>
<si:distributionXMLList>rectangle</si:distributionXMLList>
</si:expandedUncXMLList>
</si:realListXMLList>
</siTest:testData>
<siTest:testData id="DCC-GP5">
<si:realListXMLList>
<si:valueXMLList>1.0 1.0</si:valueXMLList>
<si:unitXMLList>\metre\second\tothe{-1} \metre\second\tothe{-1}</si:unitXMLList>
</si:realListXMLList>
</siTest:testData>
</siTest:testDSIXML>
\ No newline at end of file
examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml
+ 3
− 11
View file @ 8bedc272
......@@ -11,7 +11,7 @@
AUTHORS: Justin Jagieniak, Benjamin Glogeer
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
D-SI XSD VERSION: 2.1.0
D-SI XSD VERSION: 2.1.0-RC1
RELEASE DATA: 2021-10-26
DOI: 10.5281/zenodo.4709001
......@@ -28,7 +28,7 @@
-->
<siTest:metaData>
<siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.1.0)</siTest:testDescription>
<siTest:testDescription>XML examples for SmartCom D-SI data with quality class SILVER (D-SI XSD version 2.1.0-RC1)</siTest:testDescription>
</siTest:metaData>
<siTest:testData id="UM18-XMLList">
......@@ -39,7 +39,7 @@
<si:uncertaintyXMLList>0.01 0.01</si:uncertaintyXMLList>
<si:coverageFactorXMLList>2 2</si:coverageFactorXMLList>
<si:coverageProbabilityXMLList>0.95 0.95</si:coverageProbabilityXMLList>
<si:distribution>normal normal</si:distribution>
<si:distributionXMLList>normal normal</si:distributionXMLList>
</si:expandedUncXMLList>
</si:realListXMLList>
</siTest:testData>
......@@ -51,7 +51,6 @@
</si:realListXMLList>
</siTest:testData>
<siTest:testData id="PTB237-XMLList_b">
<si:realListXMLList>
<si:valueXMLList>1.0</si:valueXMLList>
......@@ -66,11 +65,4 @@
</si:realListXMLList>
</siTest:testData>
<siTest:testData id="PTB242-XMLList-b">
<si:realListXMLList>
<si:valueXMLList>1.0</si:valueXMLList>
<si:unitXMLList>\kelvin \tonne</si:unitXMLList>
</si:realListXMLList>
</siTest:testData>
</siTest:testDSIXML>
\ No newline at end of file
wiki/d-si-online-guide.md
+ 4
− 4
View file @ 8bedc272
......@@ -3,7 +3,7 @@
<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
XSD Version 2.1.0
<br /><br />
</div>
......@@ -14,7 +14,7 @@ This Online Guide specifies the principles for the exchange of machine-readable
the Digital System of Units (D-SI) metadata model [[1]](https://doi.org/10.5281/zenodo.3816686).
</p>
**Features of D-SI XML implementation (XSD Version 2.0.0)**
**Features of D-SI XML implementation (XSD Version 2.1.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
......@@ -26,8 +26,8 @@ This Online Guide specifies the principles for the exchange of machine-readable
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
an XML Schema Definition file (XSD). The version number of the XSD is 2.1.0 as this update introduced some breaking changes.
For convenience, this documentation for version 2.1.0 will provide the relevant information from the underlying D-SI
metadata model in closed form.
## Content of documentation
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment