Skip to content
Snippets Groups Projects
Commit e76e2227 authored by Daniel Hutzschenreuter's avatar Daniel Hutzschenreuter
Browse files

Updated Significant Digit

parent e4e4bf2b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
SI_Format.xsd
+ 20
− 22
View file @ e76e2227
<?xml version="1.0" encoding="UTF-8"?> <?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" targetNamespace="https://ptb.de/si"
xmlns:si="https://ptb.de/si" xmlns:si="https://ptb.de/si"
xmlns:qudt="http://qudt.org/vocab/" xmlns:qudt="http://qudt.org/vocab/"
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
CONTACT: daniel.hutzschenreuter@ptb.de CONTACT: daniel.hutzschenreuter@ptb.de
DEVELOPMENT: https://gitlab1.ptb.de/d-ptb/d-si/xsd-d-si 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 RELEASE DATA: 2023-MM-DD
DOI: 10.5281/zenodo.3366901 DOI: 10.5281/zenodo.3366901
</xs:documentation> </xs:documentation>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
(o) - element quantityTypeQUDT (qudt:quantityKindType) (o) - element quantityTypeQUDT (qudt:quantityKindType)
(m) - element value (decimal value type) (m) - element value (decimal value type)
(m) - element unit (string - SI format) (m) - element unit (string - SI format)
(o) - element significatnDigits (non negative integer) (o) - element significantDigit (integer)
(o) - element dateTime (xs:dateTime) (o) - element dateTime (xs:dateTime)
2. Measured quantity with univariate measurement uncertainty 2. Measured quantity with univariate measurement uncertainty
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
(o) - element quantityTypeQUDT (qudt:quantityKindType) (o) - element quantityTypeQUDT (qudt:quantityKindType)
(m) - element value (decimal value type) (m) - element value (decimal value type)
(m) - element unit (string - SI format) (m) - element unit (string - SI format)
(o) - element significatnDigits (non negative integer) (o) - element significantDigit (integer)
(o) - element dateTime (xs:dateTime) (o) - element dateTime (xs:dateTime)
(m) - element measurementUncertaintyUnivariate (si:measurementUncertaintyUnivaraiteType) (m) - element measurementUncertaintyUnivariate (si:measurementUncertaintyUnivaraiteType)
# with choice si:standardMU # with choice si:standardMU
...@@ -108,8 +108,8 @@ ...@@ -108,8 +108,8 @@
<xs:element name="value" type="si:decimalType"/> <xs:element name="value" type="si:decimalType"/>
<xs:element name="unit" type="si:unitType"/> <xs:element name="unit" type="si:unitType"/>
<!-- optional time stamp and significant digits --> <!-- optional time stamp and significant digit -->
<xs:element name="significantDigits" type="si:significantDigitsType" minOccurs="0"/> <xs:element name="significantDigit" type="si:significantDigitType" minOccurs="0"/>
<xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/> <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/>
<!-- optional choice of uncertainty statements --> <!-- optional choice of uncertainty statements -->
...@@ -214,10 +214,10 @@ ...@@ -214,10 +214,10 @@
The element has the following components [(m)-mandatory, (o)-optional]: The element has the following components [(m)-mandatory, (o)-optional]:
(o) - element label (string) (o) - element label (string)
(o) - element quantityTypeQUDT (qudt:quantityKindType) (o) - element quantityTypeQUDT (qudt:quantityKindType)
(m) - element value (decimal value type) (m) - element value (decimal value type)
(m) - element unit (string - SI unit) (m) - element unit (string - SI unit)
(o) - element significatnDigits (non negative integer) (o) - element significantDigit (integer)
(o) - element dateTime (xs:dateTime) (o) - element dateTime (xs:dateTime)
(o) - element valueStandardMU (decimal value >= 0) (o) - element valueStandardMU (decimal value >= 0)
(o) - element distribution (string) (o) - element distribution (string)
...@@ -245,8 +245,8 @@ ...@@ -245,8 +245,8 @@
<xs:element name="value" type="si:decimalType"/> <xs:element name="value" type="si:decimalType"/>
<xs:element name="unit" type="si:unitType"/> <xs:element name="unit" type="si:unitType"/>
<!-- optional time stamp and significatn digits --> <!-- optional time stamp and significatn digit -->
<xs:element name="significantDigits" type="si:significantDigitsType" minOccurs="0"/> <xs:element name="significantDigit" type="si:significantDigitType" minOccurs="0"/>
<xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/> <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/>
<!-- optional uncertainty --> <!-- optional uncertainty -->
...@@ -462,7 +462,7 @@ ...@@ -462,7 +462,7 @@
<!-- optional list unit --> <!-- optional list unit -->
<xs:element name="listUnit" type="si:unitType" minOccurs="0"/> <xs:element name="listUnit" type="si:unitType" minOccurs="0"/>
<!-- optional list significant digits --> <!-- 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 --> <!-- optional list uncertainty -->
<xs:element name="listMeasurementUncertaintyUnivariate" type="si:listMeasurementUncertaintyUnivariateType" minOccurs="0"> <xs:element name="listMeasurementUncertaintyUnivariate" type="si:listMeasurementUncertaintyUnivariateType" minOccurs="0">
...@@ -516,8 +516,8 @@ ...@@ -516,8 +516,8 @@
<xs:element name="value" type="si:decimalType"/> <xs:element name="value" type="si:decimalType"/>
<!-- if list unit, then do not write this local unit --> <!-- if list unit, then do not write this local unit -->
<xs:element name="unit" type="si:unitType" minOccurs="0"/> <xs:element name="unit" type="si:unitType" minOccurs="0"/>
<!-- optional local time stamp and significatn digits --> <!-- optional local time stamp and significatn digit -->
<xs:element name="significantDigits" type="si:significantDigitsType" minOccurs="0"/> <xs:element name="significantDigit" type="si:significantDigitType" minOccurs="0"/>
<xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/> <xs:element name="dateTime" type="xs:dateTime" minOccurs="0"/>
<!-- optional choice of local uncertainty statements --> <!-- optional choice of local uncertainty statements -->
<xs:choice minOccurs="0"> <xs:choice minOccurs="0">
...@@ -590,8 +590,8 @@ ...@@ -590,8 +590,8 @@
<xs:element name="valueXMLList" type="si:decimalXMLListType"/> <xs:element name="valueXMLList" type="si:decimalXMLListType"/>
<xs:element name="unitXMLList" type="si:unitXMLListType"/> <xs:element name="unitXMLList" type="si:unitXMLListType"/>
<!-- optional time stamp --> <!-- optional time stamp & significant digit -->
<xs:element name="significantDigitsXMLList" type="si:significantDigitsXMLListType" minOccurs="0"/> <xs:element name="significantDigitXMLList" type="si:significantDigitXMLListType" minOccurs="0"/>
<xs:element name="dateTimeXMLList" type="si:dateTimeXMLListType" minOccurs="0"/> <xs:element name="dateTimeXMLList" type="si:dateTimeXMLListType" minOccurs="0"/>
<!-- optional choice of uncertainty statements --> <!-- optional choice of uncertainty statements -->
...@@ -1385,27 +1385,25 @@ ...@@ -1385,27 +1385,25 @@
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="significantDigitsType"> <xs:simpleType name="significantDigitType">
<xs:annotation> <xs:annotation>
<xs:documentation xml:lang="en"> <xs:documentation xml:lang="en">
Type providing number of significant digitis Type providing number of significant digitis
with separation by blank spaces. with separation by blank spaces.
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>
<xs:restriction base="xs:nonNegativeInteger"> <xs:restriction base="xs:integer"/>
<xs:minInclusive value="1"/>
</xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="significantDigitsXMLListType"> <xs:simpleType name="significantDigitXMLListType">
<xs:annotation> <xs:annotation>
<xs:documentation xml:lang="en"> <xs:documentation xml:lang="en">
Type providing number of significant digitis Type providing number of significant digitis
with separation by blank spaces. with separation by blank spaces.
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>
<xs:list itemType="xs:nonNegativeInteger"/> <xs:list itemType="si:significantDigitType"/>
</xs:simpleType> </xs:simpleType>
...@@ -1500,7 +1498,7 @@ ...@@ -1500,7 +1498,7 @@
(o) - element distribution (string) (o) - element distribution (string)
The unit of components stdUncertainty, intervalMin and intervalMax is the unit 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:documentation>
</xs:annotation> </xs:annotation>
......
examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml
+ 2
− 2
View file @ e76e2227
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<si:real> <si:real>
<si:value>1.023</si:value> <si:value>1.023</si:value>
<si:unit>\metre</si:unit> <si:unit>\metre</si:unit>
<si:significantDigits>1</si:significantDigits> <si:significantDigit>1</si:significantDigit>
</si:real> </si:real>
</siTest:testData> </siTest:testData>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<si:quantityTypeQUDTXMLList>length</si:quantityTypeQUDTXMLList> <si:quantityTypeQUDTXMLList>length</si:quantityTypeQUDTXMLList>
<si:valueXMLList>1.23 3.454 0.78 9.87</si:valueXMLList> <si:valueXMLList>1.23 3.454 0.78 9.87</si:valueXMLList>
<si:unitXMLList>\metre</si:unitXMLList> <si:unitXMLList>\metre</si:unitXMLList>
<si:significantDigitsXMLList>3 4 3 1</si:significantDigitsXMLList> <si:significantDigitXMLList>-2 -3 -2 -1</si:significantDigitXMLList>
</si:realListXMLList> </si:realListXMLList>
</siTest:testData> </siTest:testData>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment