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

Anpassung Beispiele 


Signed-off-by: default avatarhutzsc01 <Daniel.Hutzschenreuter@ptb.de>
parent 70d3c477
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Development/SI/Examples/D-SI_all_XML_examples.xml
+ 385
− 25
View file @ a92abc7e
......@@ -67,10 +67,20 @@
</si:real>
</siTest:testData>
<siTest:testData id="EXAMPLE-4.1-D-SI-Buch">
<si:real>
<si:value>20.1</si:value>
<si:unit> \degreeCelsius</si:unit>
<si:label><![CDATA[<p>Text</p>]]></si:label>
</si:real>
</siTest:testData>
<!-- -->
<siTest:testData id="EXAMPLE-5-D-SI-Buch">
<si:real>
<si:value>20.1</si:value>
<si:unit>\degreeCesius</si:unit>
<si:label><![CDATA[Das ist eine CDATA <|/ Section>]]></si:label>
<si:dateTime> 2018-09-27T13:00:00</si:dateTime>
</si:real>
</siTest:testData>
......@@ -277,7 +287,7 @@
<si:value1>-10.30</si:value1>
<si:value2>0.05</si:value2>
<si:unit>\metre</si:unit>
<si:ellipsoidRegion>
<si:ellipsoidalRegion>
<!-- upper triangular covariance matrix row by row -->
<si:uncertainty>0.15</si:uncertainty>
<si:covariance>-0.3</si:covariance>
......@@ -286,7 +296,7 @@
<si:coverageFactor>2.45</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal-bivariate</si:distribution>
</si:ellipsoidRegion>
</si:ellipsoidalRegion>
</si:complex>
</siTest:testData>
......@@ -297,7 +307,7 @@
<si:value1>-10.30</si:value1>
<si:value2>0.05</si:value2>
<si:unit>\metre</si:unit>
<si:rectangleRegion>
<si:rectangularRegion>
<!-- list of uncertainty values -->
<si:uncertainty>0.15</si:uncertainty>
<si:uncertainty>0.15</si:uncertainty>
......@@ -305,7 +315,7 @@
<si:coverageFactor>2.39</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal-bivariate</si:distribution>
</si:rectangleRegion>
</si:rectangularRegion>
</si:complex>
</siTest:testData>
......@@ -344,7 +354,8 @@
</siTest:testData>
<siTest:testData id="EXAMPLE-202">
<!-- basic list of real quantities with global expanded measurement uncertainty -->
<!-- basic list of real quantities with
global expanded measurement uncertainty -->
<si:list>
<si:real>
<si:value>2.34</si:value>
......@@ -362,6 +373,28 @@
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-202_1">
<!-- list of real quantities with local uncertainty -->
<si:list>
<si:real>
<si:value>2.34</si:value>
<si:unit>\metre</si:unit>
<!-- local uncertainty statement -->
<si:uncertainty>0.01</si:uncertainty>
<si:coverageFactor>2</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:real>
<si:real>
<si:value>3.34</si:value>
<si:unit>\metre</si:unit>
<!-- local uncertainty statement -->
<si:uncertainty>0.01</si:uncertainty>
<si:coverageFactor>2</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
</si:real>
</si:list>
</siTest:testData>
<!--
<siTest:testData id="EXAMPLE-203">
basic list of real quantities - global unit
......@@ -413,20 +446,41 @@
<si:value>3.34</si:value>
<si:unit>\metre</si:unit>
</si:real>
<!-- type 2 - ellipsoid region -->
<si:ellipsoidRegion>
<!-- ellipsoidal coverage region -->
<si:ellipsoidalRegion>
<!-- upper triangular covariance matrix row by row -->
<si:uncertainty>1</si:uncertainty>
<si:covariance>1</si:covariance>
<si:covariance>1</si:covariance>
<si:uncertainty>1</si:uncertainty>
<si:covariance>1</si:covariance>
<si:uncertainty>1</si:uncertainty>
<si:uncertainty>0.9</si:uncertainty>
<si:covariance>0.7</si:covariance>
<si:uncertainty>0.6</si:uncertainty>
<!-- additional information -->
<si:coverageFactor>2.80</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal-multivariate</si:distribution>
</si:ellipsoidRegion>
</si:ellipsoidalRegion>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-205-1">
<si:list>
<si:real>
<si:value>2.34</si:value>
<si:unit>unit_1</si:unit>
</si:real>
<si:real>
<si:value>3.34</si:value>
<si:unit>unit_2</si:unit>
</si:real>
<!-- ellipsoidal coverage region -->
<si:ellipsoidalRegion>
<!-- upper triangular covariance matrix row by row -->
<si:uncertainty>0.9</si:uncertainty>
<si:covariance>0.7</si:covariance>
<si:uncertainty>0.6</si:uncertainty>
<!-- additional information -->
<si:coverageFactor>2.80</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal-multivariate</si:distribution>
</si:ellipsoidalRegion>
</si:list>
</siTest:testData>
......@@ -440,17 +494,16 @@
<si:value>3.34</si:value>
<si:unit>\metre</si:unit>
</si:real>
<!-- type 2 - reactangel region -->
<si:rectangleRegion>
<!-- expanded uncertainties (half length of box sides) -->
<!-- rectangular coverage region -->
<si:rectangularRegion>
<!-- expanded uncertainties (half length of box edges) -->
<si:uncertainty>1</si:uncertainty>
<si:uncertainty>2</si:uncertainty>
<si:uncertainty>3</si:uncertainty>
<!-- additional information -->
<si:coverageFactor>2.39</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal-multivariate</si:distribution>
</si:rectangleRegion>
</si:rectangularRegion>
</si:list>
</siTest:testData>
......@@ -494,6 +547,93 @@
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-208-1">
<!-- list of complex quantities -->
<si:list>
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>1.5</si:value2>
<si:unit>\metre</si:unit>
<si:unitPhase>\rad</si:unitPhase>
</si:complex>
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>180.0</si:value2>
<si:unit>\second</si:unit>
<si:unitPhase>\degree</si:unitPhase>
</si:complex>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-208-2">
<!-- list of complex quantities -->
<si:list>
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>1.5</si:value2>
<si:unit>\metre</si:unit>
<si:unitPhase>\rad</si:unitPhase>
</si:complex>
<si:complex>
<si:value1>-12.3</si:value1>
<si:value2>1.8</si:value2>
<si:unit>\metre</si:unit>
<si:unitPhase>\rad</si:unitPhase>
</si:complex>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-208-3">
<!-- list of complex quantities -->
<si:list>
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>1.5</si:value2>
</si:complex>
<si:complex>
<si:value1>-12.3</si:value1>
<si:value2>1.8</si:value2>
</si:complex>
<si:unit>\metre</si:unit>
<si:unitPhase>\rad</si:unitPhase>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-208-4">
<!-- list of complex quantities -->
<si:list>
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>1.5</si:value2>
<si:unit>\metre</si:unit>
<si:unitPhase>\rad</si:unitPhase>
</si:complex>
<si:complex>
<si:value1>-12.3</si:value1>
<si:value2>1.8</si:value2>
</si:complex>
<si:unit>\metre</si:unit>
<si:unitPhase>\rad</si:unitPhase>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-208-5">
<!-- list of complex quantities -->
<si:list>
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>1.5</si:value2>
<si:unit>\metre</si:unit>
</si:complex>
<si:complex>
<si:value1>-12.3</si:value1>
<si:value2>1.8</si:value2>
<si:unit>\metre</si:unit>
</si:complex>
<si:unitPhase>\rad</si:unitPhase>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-209">
<!-- list of complex quantities (option B.2) with global bivariate uncertainty -->
<si:list>
......@@ -509,7 +649,7 @@
<si:unit>\metre</si:unit>
</si:complex>
<!-- multivariate uncertainty -->
<si:ellipsoidRegion>
<si:ellipsoidalRegion>
<!-- covariance matrix (2x2) -->
<si:uncertainty>0.2</si:uncertainty>
<si:covariance>-0.5</si:covariance>
......@@ -518,12 +658,201 @@
<si:coverageFactor>2.80</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal</si:distribution>
</si:ellipsoidRegion>
</si:ellipsoidalRegion>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-209-1">
<!-- list of complex quantities (option 1) -->
<si:list>
<!-- list of complex quantities -->
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>0.0</si:value2>
<si:unit>\metre</si:unit>
<!-- covariance matrix (2x2) -->
<si:uncertainty1>0.2</si:uncertainty1>
<si:covariance>-0.5</si:covariance>
<si:uncertainty2>0.2</si:uncertainty2>
<!-- coverage information -->
<si:coverageFactor>2.80</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal</si:distribution>
</si:complex>
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>0.0</si:value2>
<si:unit>\metre</si:unit>
<!-- covariance matrix (2x2) -->
<si:uncertainty1>0.2</si:uncertainty1>
<si:covariance>-0.5</si:covariance>
<si:uncertainty2>0.2</si:uncertainty2>
<!-- coverage information -->
<si:coverageFactor>2.80</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal</si:distribution>
</si:complex>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-209-2">
<!-- list of complex quantities (option 1) -->
<si:list>
<!-- list of complex quantities -->
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>0.0</si:value2>
<si:unit>\metre</si:unit>
</si:complex>
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>0.0</si:value2>
<si:unit>\metre</si:unit>
</si:complex>
<!-- global bivariate uncertainty -->
<si:uncertainty1>0.2</si:uncertainty1>
<si:covariance>-0.5</si:covariance>
<si:uncertainty2>0.2</si:uncertainty2>
<!-- coverage information -->
<si:coverageFactor>2.80</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal</si:distribution>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-209-3">
<!-- list of complex quantities (option 2) -->
<si:list>
<!-- list of complex quantities -->
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>0.0</si:value2>
<si:unit>\metre</si:unit>
<si:ellipsoidalRegion>
<!-- covariance matrix (2x2) -->
<si:uncertainty>0.2</si:uncertainty>
<si:covariance>-0.5</si:covariance>
<si:uncertainty>0.2</si:uncertainty>
<!-- coverage information -->
<si:coverageFactor>2.80</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal</si:distribution>
</si:ellipsoidalRegion>
</si:complex>
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>0.0</si:value2>
<si:unit>\metre</si:unit>
<si:ellipsoidalRegion>
<!-- covariance matrix (2x2) -->
<si:uncertainty>0.2</si:uncertainty>
<si:covariance>-0.5</si:covariance>
<si:uncertainty>0.2</si:uncertainty>
<!-- coverage information -->
<si:coverageFactor>2.80</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal</si:distribution>
</si:ellipsoidalRegion>
</si:complex>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-209-4">
<!-- list of complex quantities (option 2) -->
<si:list>
<!-- list of complex quantities -->
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>0.0</si:value2>
<si:unit>\metre</si:unit>
</si:complex>
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>0.0</si:value2>
<si:unit>\metre</si:unit>
</si:complex>
<!-- global bivariate uncertainty -->
<si:ellipsoidalRegion>
<!-- covariance matrix (2x2) -->
<si:uncertainty>0.2</si:uncertainty>
<si:covariance>-0.5</si:covariance>
<si:uncertainty>0.2</si:uncertainty>
<!-- coverage information -->
<si:coverageFactor>2.80</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal</si:distribution>
</si:ellipsoidalRegion>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-209-5">
<!-- list of complex quantities (option 2) -->
<si:list>
<!-- list of complex quantities -->
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>0.0</si:value2>
<si:unit>\metre</si:unit>
<si:unitPhase>\rad</si:unitPhase>
</si:complex>
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>0.0</si:value2>
<si:unit>\metre</si:unit>
<si:unitPhase>\rad</si:unitPhase>
</si:complex>
<!-- global bivariate uncertainty -->
<si:ellipsoidalRegion>
<!-- covariance matrix (2x2) -->
<si:uncertainty>0.2</si:uncertainty>
<si:covariance>-0.5</si:covariance>
<si:uncertainty>0.2</si:uncertainty>
<!-- coverage information -->
<si:coverageFactor>2.80</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal</si:distribution>
</si:ellipsoidalRegion>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-210">
<!-- list of complex quantities (option B) with multivariate uncertainty -->
<!-- list of complex quantities (multivariate) -->
<si:list>
<!-- list of complex quantities -->
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>0.0</si:value2>
<si:unit>\metre</si:unit>
</si:complex>
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>0.0</si:value2>
<si:unit>\metre</si:unit>
</si:complex>
<!-- multivariate uncertainty -->
<si:ellipsoidalRegion>
<!-- covariance matrix (4x4) -->
<si:uncertainty>0.1</si:uncertainty>
<si:covariance>-0.5</si:covariance>
<si:covariance>-0.5</si:covariance>
<si:covariance>-0.5</si:covariance>
<si:uncertainty>0.2</si:uncertainty>
<si:covariance>-0.5</si:covariance>
<si:covariance>-0.5</si:covariance>
<si:uncertainty>0.2</si:uncertainty>
<si:covariance>-0.5</si:covariance>
<si:uncertainty>0.2</si:uncertainty>
<!-- coverage information -->
<si:coverageFactor>2.80</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal</si:distribution>
</si:ellipsoidalRegion>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-210-1">
<!-- list of complex quantities (multivariate) -->
<si:list>
<!-- list of complex quantities -->
<si:complex>
......@@ -537,7 +866,38 @@
<si:unit>\metre</si:unit>
</si:complex>
<!-- multivariate uncertainty -->
<si:ellipsoidRegion>
<si:rectangularRegion>
<!-- rectagular box lengths (dimension 4) -->
<si:uncertainty>0.1</si:uncertainty>
<si:uncertainty>0.2</si:uncertainty>
<si:uncertainty>0.2</si:uncertainty>
<si:uncertainty>0.2</si:uncertainty>
<!-- coverage information -->
<si:coverageFactor>2.80</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal</si:distribution>
</si:rectangularRegion>
</si:list>
</siTest:testData>
<siTest:testData id="EXAMPLE-210-2">
<!-- list of complex quantities (multivariate) -->
<si:list>
<!-- list of complex quantities -->
<si:complex>
<si:value1>-10.3</si:value1>
<si:value2>1.5.0</si:value2>
<si:unit>\metre</si:unit>
<si:unitPhase>\rad</si:unitPhase>
</si:complex>
<si:complex>
<si:value1>-12.3</si:value1>
<si:value2>180.0</si:value2>
<si:unit>\second</si:unit>
<si:unitPhase>\degree</si:unitPhase>
</si:complex>
<!-- multivariate uncertainty -->
<si:ellipsoidalRegion>
<!-- covariance matrix (4x4) -->
<si:uncertainty>0.1</si:uncertainty>
<si:covariance>-0.5</si:covariance>
......@@ -553,7 +913,7 @@
<si:coverageFactor>2.80</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal</si:distribution>
</si:ellipsoidRegion>
</si:ellipsoidalRegion>
</si:list>
</siTest:testData>
......
Development/SI/Examples/Examples_02_complex.xml
+ 1
− 1
View file @ a92abc7e
......@@ -127,8 +127,8 @@
<si:unit>\metre</si:unit>
<!-- uncertainty -->
<si:uncertainty1>0.25</si:uncertainty1>
<si:uncertainty2>0.20</si:uncertainty2>
<si:covariance>-0.01</si:covariance>
<si:uncertainty2>0.20</si:uncertainty2>
<si:coverageFactor>2.45</si:coverageFactor>
<si:coverageProbability>0.95</si:coverageProbability>
<si:distribution>normal-bivariate</si:distribution>
......
Development/SI/SI_Format_v1.1.xsd
+ 13
− 13
View file @ a92abc7e
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
<xs:schema version="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="https://gitlab1.ptb.de/D-SI-public/xml/tree/master/SI"
xmlns:si="https://gitlab1.ptb.de/D-SI-public/xml/tree/master/SI"
elementFormDefault="qualified">
......@@ -318,8 +318,8 @@
<!-- optional uncertainty statement: either elliptical or rectangular region
Taxonomy of elements reviewed by NPL and subject to appropriate changes -->
<xs:choice minOccurs="0">
<xs:element ref="si:ellipsoidRegion"/>
<xs:element ref="si:rectangleRegion"/>
<xs:element ref="si:ellipsoidalRegion"/>
<xs:element ref="si:rectangularRegion"/>
</xs:choice>
</xs:sequence>
......@@ -327,7 +327,7 @@
</xs:element>
<!-- Structure under development by NPL and PTB -->
<xs:element name="ellipsoidRegion">
<xs:element name="ellipsoidalRegion">
<xs:complexType>
<xs:sequence>
<!-- upper triangular covariance matrix values (minimum of 3 entries) -->
......@@ -346,7 +346,7 @@
<!-- Structure under development by NPL and PTB -->
<xs:element name="rectangleRegion">
<xs:element name="rectangularRegion">
<xs:complexType>
<xs:sequence>
<!-- list of expanded uncertainties (minimum of 2 elements)-->
......@@ -499,8 +499,8 @@
<!-- statement of a coverage regione that provides a global multivariate uncertainty specification -->
<xs:sequence>
<xs:choice minOccurs="0">
<xs:element ref="si:ellipsoidRegion"/>
<xs:element ref="si:rectangleRegion"/>
<xs:element ref="si:ellipsoidalRegion"/>
<xs:element ref="si:rectangularRegion"/>
</xs:choice>
</xs:sequence>
</xs:choice>
......@@ -525,8 +525,8 @@
<!-- optional global uncertainty statement -->
<xs:choice minOccurs="0">
<xs:element ref="si:ellipsoidRegion"/>
<xs:element ref="si:rectangleRegion"/>
<xs:element ref="si:ellipsoidalRegion"/>
<xs:element ref="si:rectangularRegion"/>
</xs:choice>
</xs:sequence>
......@@ -560,8 +560,8 @@
<!-- optional statement of a coverage regione that provides a global multivariate uncertainty specification -->
<xs:choice minOccurs="0">
<xs:element ref="si:ellipsoidRegion"/>
<xs:element ref="si:rectangleRegion"/>
<xs:element ref="si:ellipsoidalRegion"/>
<xs:element ref="si:rectangularRegion"/>
</xs:choice>
</xs:sequence>
......@@ -579,8 +579,8 @@
<!-- optional statement of a coverage regione that provides a global multivariate uncertainty specification -->
<xs:choice minOccurs="0">
<xs:element ref="si:ellipsoidRegion"/>
<xs:element ref="si:rectangleRegion"/>
<xs:element ref="si:ellipsoidalRegion"/>
<xs:element ref="si:rectangularRegion"/>
</xs:choice>
</xs:sequence>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment