From e76e22271b0d965cd178d66041c8338a951a3e2f Mon Sep 17 00:00:00 2001
From: hutzsc01 <Daniel.Hutzschenreuter@ptb.de>
Date: Fri, 12 May 2023 09:48:38 +0200
Subject: [PATCH] Updated Significant Digit
---
SI_Format.xsd | 42 +++++++++----------
.../2023-03-31-PLATINUM-examples-1.xml | 4 +-
2 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/SI_Format.xsd b/SI_Format.xsd
index 8a2aeba..7f563bf 100644
--- a/SI_Format.xsd
+++ b/SI_Format.xsd
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema version="2.2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+<xs:schema version="2.2.0-beta" xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="https://ptb.de/si"
xmlns:si="https://ptb.de/si"
xmlns:qudt="http://qudt.org/vocab/"
@@ -24,7 +24,7 @@
CONTACT: daniel.hutzschenreuter@ptb.de
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si
- D-SI XSD VERSION: 2.2.0
+ D-SI XSD VERSION: 2.2.0-beta
RELEASE DATA: 2023-MM-DD
DOI: 10.5281/zenodo.3366901
</xs:documentation>
@@ -62,7 +62,7 @@
(o) - element quantityTypeQUDT (qudt:quantityKindType)
(m) - element value (decimal value type)
(m) - element unit (string - SI format)
- (o) - element significatnDigits (non negative integer)
+ (o) - element significantDigit (integer)
(o) - element dateTime (xs:dateTime)
2. Measured quantity with univariate measurement uncertainty
@@ -70,7 +70,7 @@
(o) - element quantityTypeQUDT (qudt:quantityKindType)
(m) - element value (decimal value type)
(m) - element unit (string - SI format)
- (o) - element significatnDigits (non negative integer)
+ (o) - element significantDigit (integer)
(o) - element dateTime (xs:dateTime)
(m) - element measurementUncertaintyUnivariate (si:measurementUncertaintyUnivaraiteType)
# with choice si:standardMU
@@ -108,8 +108,8 @@
<xs:element name="value" type="si:decimalType"/>
<xs:element name="unit" type="si:unitType"/>
- <!-- optional time stamp and significant digits -->
- <xs:element name="significantDigits" type="si:significantDigitsType" minOccurs="0"/>
+ <!-- optional time stamp and significant digit -->
+ <xs:element name="significantDigit" type="si:significantDigitType" minOccurs="0"/>
<xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/>
<!-- optional choice of uncertainty statements -->
@@ -214,10 +214,10 @@
The element has the following components [(m)-mandatory, (o)-optional]:
(o) - element label (string)
- (o) - element quantityTypeQUDT (qudt:quantityKindType)
+ (o) - element quantityTypeQUDT (qudt:quantityKindType)
(m) - element value (decimal value type)
(m) - element unit (string - SI unit)
- (o) - element significatnDigits (non negative integer)
+ (o) - element significantDigit (integer)
(o) - element dateTime (xs:dateTime)
(o) - element valueStandardMU (decimal value >= 0)
(o) - element distribution (string)
@@ -245,8 +245,8 @@
<xs:element name="value" type="si:decimalType"/>
<xs:element name="unit" type="si:unitType"/>
- <!-- optional time stamp and significatn digits -->
- <xs:element name="significantDigits" type="si:significantDigitsType" minOccurs="0"/>
+ <!-- optional time stamp and significatn digit -->
+ <xs:element name="significantDigit" type="si:significantDigitType" minOccurs="0"/>
<xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/>
<!-- optional uncertainty -->
@@ -462,7 +462,7 @@
<!-- optional list unit -->
<xs:element name="listUnit" type="si:unitType" minOccurs="0"/>
<!-- optional list significant digits -->
- <xs:element name="listSignificantDigits" type="si:significantDigitsType" minOccurs="0"/>
+ <xs:element name="listsignificantDigit" type="si:significantDigitType" minOccurs="0"/>
<!-- optional list uncertainty -->
<xs:element name="listMeasurementUncertaintyUnivariate" type="si:listMeasurementUncertaintyUnivariateType" minOccurs="0">
@@ -516,8 +516,8 @@
<xs:element name="value" type="si:decimalType"/>
<!-- if list unit, then do not write this local unit -->
<xs:element name="unit" type="si:unitType" minOccurs="0"/>
- <!-- optional local time stamp and significatn digits -->
- <xs:element name="significantDigits" type="si:significantDigitsType" minOccurs="0"/>
+ <!-- optional local time stamp and significatn digit -->
+ <xs:element name="significantDigit" type="si:significantDigitType" minOccurs="0"/>
<xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/>
<!-- optional choice of local uncertainty statements -->
<xs:choice minOccurs="0">
@@ -590,8 +590,8 @@
<xs:element name="valueXMLList" type="si:decimalXMLListType"/>
<xs:element name="unitXMLList" type="si:unitXMLListType"/>
- <!-- optional time stamp -->
- <xs:element name="significantDigitsXMLList" type="si:significantDigitsXMLListType" minOccurs="0"/>
+ <!-- optional time stamp & significant digit -->
+ <xs:element name="significantDigitXMLList" type="si:significantDigitXMLListType" minOccurs="0"/>
<xs:element name="dateTimeXMLList" type="si:dateTimeXMLListType" minOccurs="0"/>
<!-- optional choice of uncertainty statements -->
@@ -1385,27 +1385,25 @@
</xs:simpleType>
- <xs:simpleType name="significantDigitsType">
+ <xs:simpleType name="significantDigitType">
<xs:annotation>
<xs:documentation xml:lang="en">
Type providing number of significant digitis
with separation by blank spaces.
</xs:documentation>
</xs:annotation>
- <xs:restriction base="xs:nonNegativeInteger">
- <xs:minInclusive value="1"/>
- </xs:restriction>
+ <xs:restriction base="xs:integer"/>
</xs:simpleType>
- <xs:simpleType name="significantDigitsXMLListType">
+ <xs:simpleType name="significantDigitXMLListType">
<xs:annotation>
<xs:documentation xml:lang="en">
Type providing number of significant digitis
with separation by blank spaces.
</xs:documentation>
</xs:annotation>
- <xs:list itemType="xs:nonNegativeInteger"/>
+ <xs:list itemType="si:significantDigitType"/>
</xs:simpleType>
@@ -1500,7 +1498,7 @@
(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.
+ used in the context of si:real.
]]>
</xs:documentation>
</xs:annotation>
diff --git a/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml b/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml
index 6590688..e5b2e99 100644
--- a/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml
+++ b/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml
@@ -61,7 +61,7 @@
<si:real>
<si:value>1.023</si:value>
<si:unit>\metre</si:unit>
- <si:significantDigits>1</si:significantDigits>
+ <si:significantDigit>1</si:significantDigit>
</si:real>
</siTest:testData>
@@ -70,7 +70,7 @@
<si:quantityTypeQUDTXMLList>length</si:quantityTypeQUDTXMLList>
<si:valueXMLList>1.23 3.454 0.78 9.87</si:valueXMLList>
<si:unitXMLList>\metre</si:unitXMLList>
- <si:significantDigitsXMLList>3 4 3 1</si:significantDigitsXMLList>
+ <si:significantDigitXMLList>-2 -3 -2 -1</si:significantDigitXMLList>
</si:realListXMLList>
</siTest:testData>
--
GitLab