From e4e4bf2b1019b74543a1c5002e409ea79c4d1619 Mon Sep 17 00:00:00 2001
From: hutzsc01 <Daniel.Hutzschenreuter@ptb.de>
Date: Tue, 11 Apr 2023 16:18:33 +0200
Subject: [PATCH] Remaining Uncertainty Updates done
---
SI_Format.xsd | 71 ++--
.../2021-11-22-BRONZE-examples-xmllists.xml | 2 +-
.../2021-10-26-GOLD-examples-xmllists.xml | 2 +-
.../2021-10-26-PLATINUM-examples-xmllists.xml | 2 +-
.../2023-03-31-PLATINUM-examples-1.xml | 358 ++++++++++--------
.../2021-11-22-SILVER-examples-xmllists.xml | 2 +-
6 files changed, 244 insertions(+), 193 deletions(-)
diff --git a/SI_Format.xsd b/SI_Format.xsd
index e52db63..8a2aeba 100644
--- a/SI_Format.xsd
+++ b/SI_Format.xsd
@@ -73,7 +73,7 @@
(o) - element significatnDigits (non negative integer)
(o) - element dateTime (xs:dateTime)
(m) - element measurementUncertaintyUnivariate (si:measurementUncertaintyUnivaraiteType)
- # with choice si:standardMU
+ # with choice si:standardMU
or si:expandedMU
or si:coverageIntervalMU
# or [deprecated] si:expandedUnc
@@ -178,7 +178,7 @@
<xs:complexType name="expandedUncType">
<xs:annotation>
- <xs:documentation xml:lang="en">[deprecated element] use si:measurementUncertaintyExpanded</xs:documentation>
+ <xs:documentation xml:lang="en">[deprecated element] use si:expandedMU</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="uncertainty" type="si:uncertaintyValueType"/>
@@ -191,7 +191,7 @@
<xs:complexType name="coverageIntervalType">
<xs:annotation>
- <xs:documentation xml:lang="en">[deprecated element] use si:measurementUncertaintyInterval</xs:documentation>
+ <xs:documentation xml:lang="en">[deprecated element] use si:coverageIntervalMU</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="standardUnc" type="si:uncertaintyValueType"/>
@@ -253,7 +253,13 @@
<xs:element name="valueStandardMU" type="si:valueStandardMUType" minOccurs="0"/>
<!-- deprecated element standardUnc: use valueStandardMU instead -->
- <xs:element name="uncertainty" type="si:uncertaintyValueType" minOccurs="0"/>
+ <xs:element name="uncertainty" type="si:uncertaintyValueType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ [deprecated element] Use si:valueStandardMU instead.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
<!-- optional distribution -->
<xs:element name="distribution" type="xs:string" minOccurs="0"/>
@@ -593,19 +599,18 @@
<xs:annotation>
<xs:documentation xml:lang="en">univariate measurement uncertainty</xs:documentation>
</xs:annotation>
- <xs:element name="measurementUncertaintyUnivaraiteXMLList" type="si:measurementUncertaintyUnivariateXMLListType"/>
+ <xs:element name="measurementUncertaintyUnivariateXMLList" type="si:measurementUncertaintyUnivariateXMLListType"/>
<!-- deprecated types -->
<xs:element name="expandedUncXMLList" type="si:expandedUncXMLListType"/>
<xs:element name="coverageIntervalXMLList" type="si:coverageIntervalXMLListType"/>
</xs:choice>
- <!-- TODO -->
+
<xs:choice minOccurs="0">
<xs:annotation>
<xs:documentation xml:lang="en">multivariate measurement uncertainty</xs:documentation>
</xs:annotation>
- <xs:element name="mUncMultivarEllipsoidalXMLList" type="si:measurementUncertaintyEllipsoidalXMLListType"/>
- <xs:element name="mUncMultivarRectangularXMLList" type="si:measurementUncertaintyRectangularXMLListType"/>
+ <xs:element name="measurementUncertaintyMultivariateXMLList" type="si:measurementUncertaintyMultivariateXMLListType"/>
<!-- [deprecated elements] use mUncMultivarEllipsoidalXMLList or mUncMultivarRectangularXMLList instead -->
<xs:element name="ellipsoidalRegionXMLList" type="si:ellipsoidalRegionType"/>
@@ -664,7 +669,7 @@
<xs:complexType name="expandedUncXMLListType">
<xs:annotation>
- <xs:documentation xml:lang="en">[deprecated type] use si:measurementUncertaintyExpandedXMLListType </xs:documentation>
+ <xs:documentation xml:lang="en">[deprecated type] use si:expandedMUXMLListType </xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="uncertaintyXMLList" type="si:uncertaintyValueXMLListType"/>
@@ -677,7 +682,7 @@
<xs:complexType name="coverageIntervalXMLListType">
<xs:annotation>
- <xs:documentation xml:lang="en">[deprecated type] use si:measurementUncertaintyIntervalXMLListType</xs:documentation>
+ <xs:documentation xml:lang="en">[deprecated type] use si:coverageIntervalMUXMLListType</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="standardUncXMLList" type="si:uncertaintyValueXMLListType"/>
@@ -689,7 +694,20 @@
</xs:complexType>
- <xs:complexType name="measurementUncertaintyEllipsoidalXMLListType">
+ <xs:complexType name="measurementUncertaintyMultivariateXMLListType">
+ <xs:choice minOccurs="0">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ multivariate measurement uncertainty in XML list.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:element name="ellipsoidalRegionMUXMLList" type="si:ellipsoidalRegionMUXMLListType"/>
+ <xs:element name="rectangularRegionMUXMLList" type="si:rectangularRegionMUXMLListType"/>
+ </xs:choice>
+ </xs:complexType>
+
+
+ <xs:complexType name="ellipsoidalRegionMUXMLListType">
<xs:sequence>
<!-- covariance matrix data -->
<xs:element name="covarianceMatrixXMLList" type="si:covarianceMatrixXMLListType"/>
@@ -702,7 +720,7 @@
</xs:complexType>
- <xs:complexType name="measurementUncertaintyRectangularXMLListType">
+ <xs:complexType name="rectangularRegionMUXMLListType">
<xs:sequence>
<!-- covariance matrix data -->
<xs:element name="covarianceMatrixXMLList" type="si:covarianceMatrixXMLListType"/>
@@ -929,30 +947,40 @@
<xs:element name="dateTimeXMLList" type="si:dateTimeXMLListType" minOccurs="0"/>
<!-- optional uncertainty statement: either ellipsoidal or rectangular coverage region -->
- <xs:choice minOccurs="0">
+ <xs:element name="measurementUncertaintyBivariateXMLList" type="si:measurementUncertaintyBivariateXMLListType" minOccurs="0">
<xs:annotation>
<xs:documentation xml:lang="en">
bivariate measurement uncertainty
</xs:documentation>
</xs:annotation>
- <xs:element name="mUncBivarEllipsoidalXMLList" type="si:measurementUncertaintyEllipsoidalXMLListType"/>
- <xs:element name="mUncBivarRectangularXMLList" type="si:measurementUncertaintyRectangularXMLListType"/>
- </xs:choice>
+ </xs:element>
<!-- optional multivariate uncertainty statement -->
- <xs:choice minOccurs="0">
+ <xs:element name="measurementUncertaintyMultivariateXMLList" type="si:measurementUncertaintyMultivariateXMLListType" minOccurs="0">
<xs:annotation>
<xs:documentation xml:lang="en">
multivariate measurement uncertainty
</xs:documentation>
</xs:annotation>
- <xs:element name="mUncMultivarEllipsoidalXMLList" type="si:measurementUncertaintyEllipsoidalXMLListType"/>
- <xs:element name="mUncMultivarRectangularXMLList" type="si:measurementUncertaintyRectangularXMLListType"/>
- </xs:choice>
+ </xs:element>
+
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="measurementUncertaintyBivariateXMLListType">
+ <xs:choice minOccurs="0">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ bivariate measurement uncertainty in XML list for complex quantities.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:element name="ellipsoidalRegionMUXMLList" type="si:ellipsoidalRegionMUXMLListType"/>
+ <xs:element name="rectangularRegionMUXMLList" type="si:rectangularRegionMUXMLListType"/>
+ </xs:choice>
+ </xs:complexType>
+
+
@@ -1459,8 +1487,7 @@
<xs:documentation xml:lang="en">
[deprectated element] 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.
+ must always be used in the context of a real quantity.
</xs:documentation>
<xs:documentation xml:lang="en">
<![CDATA[
diff --git a/examples/BRONZE/2021-11-22-BRONZE-examples-xmllists.xml b/examples/BRONZE/2021-11-22-BRONZE-examples-xmllists.xml
index 548e2c8..1e810b0 100644
--- a/examples/BRONZE/2021-11-22-BRONZE-examples-xmllists.xml
+++ b/examples/BRONZE/2021-11-22-BRONZE-examples-xmllists.xml
@@ -54,7 +54,7 @@
<siTest:testData id="PTB659">
<si:realListXMLList>
- <si:quantityTypeXMLList>temperature speed</si:quantityTypeXMLList>
+ <si:quantityTypeQUDTXMLList>temperature speed</si:quantityTypeQUDTXMLList>
<si:valueXMLList>1.0 1.0</si:valueXMLList>
<si:unitXMLList>\kelvin \knot</si:unitXMLList>
</si:realListXMLList>
diff --git a/examples/GOLD/2021-10-26-GOLD-examples-xmllists.xml b/examples/GOLD/2021-10-26-GOLD-examples-xmllists.xml
index bd6b993..e896d8d 100644
--- a/examples/GOLD/2021-10-26-GOLD-examples-xmllists.xml
+++ b/examples/GOLD/2021-10-26-GOLD-examples-xmllists.xml
@@ -81,7 +81,7 @@
<siTest:testData id="PTB660">
<si:realListXMLList>
- <si:quantityTypeXMLList>mass pressure</si:quantityTypeXMLList>
+ <si:quantityTypeQUDTXMLList>mass pressure</si:quantityTypeQUDTXMLList>
<si:valueXMLList>1.0 1.0</si:valueXMLList>
<si:unitXMLList>\gram \pascal</si:unitXMLList>
</si:realListXMLList>
diff --git a/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml b/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml
index b654406..240e1a8 100644
--- a/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml
+++ b/examples/PLATINUM/2021-10-26-PLATINUM-examples-xmllists.xml
@@ -114,7 +114,7 @@
<siTest:testData id="PTB661">
<si:realListXMLList>
- <si:quantityTypeXMLList>mass current</si:quantityTypeXMLList>
+ <si:quantityTypeQUDTXMLList>mass current</si:quantityTypeQUDTXMLList>
<si:valueXMLList>1.0 1.0</si:valueXMLList>
<si:unitXMLList>\kilogram \ampere</si:unitXMLList>
</si:realListXMLList>
diff --git a/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml b/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml
index 180eabb..6590688 100644
--- a/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml
+++ b/examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml
@@ -78,10 +78,12 @@
<si:real>
<si:value>1.00</si:value>
<si:unit>\metre</si:unit>
- <si:measurementUncertaintyStandard>
- <si:valueStandardMU>0.05</si:valueStandardMU>
- <si:distribution>normal</si:distribution>
- </si:measurementUncertaintyStandard>
+ <si:measurementUncertaintyUnivariate>
+ <si:standardMU>
+ <si:valueStandardMU>0.05</si:valueStandardMU>
+ <si:distribution>normal</si:distribution>
+ </si:standardMU>
+ </si:measurementUncertaintyUnivariate>
</si:real>
</siTest:testData>
@@ -90,12 +92,15 @@
<si:value>1.00</si:value>
<si:unit>\metre</si:unit>
- <si:measurementUncertaintyExpanded>
- <si:valueExpandedMU>0.10</si:valueExpandedMU>
- <si:coverageFactor>1.96</si:coverageFactor>
- <si:coverageProbability>0.95</si:coverageProbability>
- <si:distribution>normal</si:distribution>
- </si:measurementUncertaintyExpanded>
+ <si:measurementUncertaintyUnivariate>
+ <si:expandedMU>
+ <si:valueExpandedMU>0.10</si:valueExpandedMU>
+ <si:coverageFactor>1.96</si:coverageFactor>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal</si:distribution>
+ </si:expandedMU>
+ </si:measurementUncertaintyUnivariate>
+
</si:real>
</siTest:testData>
@@ -103,13 +108,16 @@
<si:real>
<si:value>1.00</si:value>
<si:unit>\metre</si:unit>
- <si:measurementUncertaintyInterval>
- <si:valueStandardMU>0.05</si:valueStandardMU>
- <si:intervalMin>0.90</si:intervalMin>
- <si:intervalMax>1.20</si:intervalMax>
- <si:coverageProbability>0.95</si:coverageProbability>
- <si:distribution>normal</si:distribution>
- </si:measurementUncertaintyInterval>
+ <si:measurementUncertaintyUnivariate>
+ <si:coverageIntervalMU>
+ <si:valueStandardMU>0.05</si:valueStandardMU>
+ <si:intervalMin>0.90</si:intervalMin>
+ <si:intervalMax>1.20</si:intervalMax>
+ <si:coverageProbability>0.95</si:coverageProbability>
+ <si:distribution>normal</si:distribution>
+ </si:coverageIntervalMU>
+ </si:measurementUncertaintyUnivariate>
+
</si:real>
</siTest:testData>
@@ -126,10 +134,13 @@
<si:realListXMLList>
<si:valueXMLList>1.0 2.0 3.0 4.0</si:valueXMLList>
<si:unitXMLList>\metre</si:unitXMLList>
- <si:measurementUncertaintyStandardXMLList>
- <si:valueStandardMUXMLList>0.1 0.1 0.1 0.1</si:valueStandardMUXMLList>
- <si:distributionXMLList>nomral rectangular triangle student</si:distributionXMLList>
- </si:measurementUncertaintyStandardXMLList>
+ <si:measurementUncertaintyUnivariateXMLList>
+ <si:standardMUXMLList>
+ <si:valueStandardMUXMLList>0.1 0.1 0.1 0.1</si:valueStandardMUXMLList>
+ <si:distributionXMLList>nomral rectangular triangle student</si:distributionXMLList>
+ </si:standardMUXMLList>
+ </si:measurementUncertaintyUnivariateXMLList>
+
</si:realListXMLList>
</siTest:testData>
@@ -137,12 +148,15 @@
<si:realListXMLList>
<si:valueXMLList>1.0 2.0 3.0 4.0</si:valueXMLList>
<si:unitXMLList>\metre</si:unitXMLList>
- <si:measurementUncertaintyExpandedXMLList>
- <si:valueExpandedMUXMLList>0.1 0.1 0.1 0.1</si:valueExpandedMUXMLList>
- <si:coverageFactorXMLList>1.96 2.00 3.0 1.0</si:coverageFactorXMLList>
- <si:coverageProbabilityXMLList>0.95 0.06 0.98 1.00</si:coverageProbabilityXMLList>
- <si:distributionXMLList>normal rectangular triangle student</si:distributionXMLList>
- </si:measurementUncertaintyExpandedXMLList>
+ <si:measurementUncertaintyUnivariateXMLList>
+ <si:expandedMUXMLList>
+ <si:valueExpandedMUXMLList>0.1 0.1 0.1 0.1</si:valueExpandedMUXMLList>
+ <si:coverageFactorXMLList>1.96 2.00 3.0 1.0</si:coverageFactorXMLList>
+ <si:coverageProbabilityXMLList>0.95 0.06 0.98 1.00</si:coverageProbabilityXMLList>
+ <si:distributionXMLList>normal rectangular triangle student</si:distributionXMLList>
+ </si:expandedMUXMLList>
+ </si:measurementUncertaintyUnivariateXMLList>
+
</si:realListXMLList>
</siTest:testData>
@@ -150,13 +164,16 @@
<si:realListXMLList>
<si:valueXMLList>1.0 2.0 3.0 4.0</si:valueXMLList>
<si:unitXMLList>\metre</si:unitXMLList>
- <si:measurementUncertaintyIntervalXMLList>
- <si:valueStandardMUXMLList>0.1</si:valueStandardMUXMLList>
- <si:intervalMinXMLList>0.0</si:intervalMinXMLList>
- <si:intervalMaxXMLList>2.0 3.0 4.0 5.0</si:intervalMaxXMLList>
- <si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList>
- <si:distributionXMLList>normal</si:distributionXMLList>
- </si:measurementUncertaintyIntervalXMLList>
+ <si:measurementUncertaintyUnivariateXMLList>
+ <si:coverageIntervalMUXMLList>
+ <si:valueStandardMUXMLList>0.1</si:valueStandardMUXMLList>
+ <si:intervalMinXMLList>0.0</si:intervalMinXMLList>
+ <si:intervalMaxXMLList>2.0 3.0 4.0 5.0</si:intervalMaxXMLList>
+ <si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList>
+ <si:distributionXMLList>normal</si:distributionXMLList>
+ </si:coverageIntervalMUXMLList>
+ </si:measurementUncertaintyUnivariateXMLList>
+
</si:realListXMLList>
</siTest:testData>
@@ -166,33 +183,36 @@
<si:valueRealXMLList>1.0 2.0</si:valueRealXMLList>
<si:valueImagXMLList>1.0 2.0</si:valueImagXMLList>
<si:unitXMLList>\metre</si:unitXMLList>
- <si:mUncBivarEllipsoidalXMLList>
- <si:covarianceMatrixXMLList>
- <si:columnXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.5 0.5</si:valueXMLList>
- <si:unitXMLList>\metre\metre</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.0 0.0</si:valueXMLList>
- <si:unitXMLList>\metre\metre</si:unitXMLList>
- </si:covarianceXMLList>
- </si:columnXMLList>
- <si:columnXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.5 0.5</si:valueXMLList>
- <si:unitXMLList>\metre\metre</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.0 0.0</si:valueXMLList>
- <si:unitXMLList>\metre\metre</si:unitXMLList>
- </si:covarianceXMLList>
- </si:columnXMLList>
- </si:covarianceMatrixXMLList>
- <si:coverageFactorXMLList>1.96 2.00</si:coverageFactorXMLList>
- <si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList>
- <si:distributionXMLList>normal real</si:distributionXMLList>
- </si:mUncBivarEllipsoidalXMLList>
+ <si:measurementUncertaintyBivariateXMLList>
+ <si:ellipsoidalRegionMUXMLList>
+ <si:covarianceMatrixXMLList>
+ <si:columnXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.5 0.5</si:valueXMLList>
+ <si:unitXMLList>\metre\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.0 0.0</si:valueXMLList>
+ <si:unitXMLList>\metre\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ </si:columnXMLList>
+ <si:columnXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.5 0.5</si:valueXMLList>
+ <si:unitXMLList>\metre\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.0 0.0</si:valueXMLList>
+ <si:unitXMLList>\metre\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ </si:columnXMLList>
+ </si:covarianceMatrixXMLList>
+ <si:coverageFactorXMLList>1.96 2.00</si:coverageFactorXMLList>
+ <si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList>
+ <si:distributionXMLList>normal real</si:distributionXMLList>
+ </si:ellipsoidalRegionMUXMLList>
+ </si:measurementUncertaintyBivariateXMLList>
+
</si:complexListXMLList>
</siTest:testData>
@@ -202,85 +222,87 @@
<si:valuePhaseXMLList>1.0 2.0</si:valuePhaseXMLList>
<si:unitXMLList>\metre</si:unitXMLList>
<si:unitPhaseXMLList>\one</si:unitPhaseXMLList>
- <si:mUncMultivarEllipsoidalXMLList>
- <si:covarianceMatrixXMLList>
- <si:columnXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.5 0.5</si:valueXMLList>
- <si:unitXMLList>\metre\metre</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.0 0.0</si:valueXMLList>
- <si:unitXMLList>\metre</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.5 0.5</si:valueXMLList>
- <si:unitXMLList>\metre\metre</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.0 0.0</si:valueXMLList>
- <si:unitXMLList>\metre</si:unitXMLList>
- </si:covarianceXMLList>
- </si:columnXMLList>
- <si:columnXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.5 0.5</si:valueXMLList>
- <si:unitXMLList>\metre</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.0 0.0</si:valueXMLList>
- <si:unitXMLList>\one</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.5 0.5</si:valueXMLList>
- <si:unitXMLList>\metre</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.0 0.0</si:valueXMLList>
- <si:unitXMLList>\one</si:unitXMLList>
- </si:covarianceXMLList>
- </si:columnXMLList>
- <si:columnXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.5 0.5</si:valueXMLList>
- <si:unitXMLList>\metre\metre</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.0 0.0</si:valueXMLList>
- <si:unitXMLList>\metre</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.5 0.5</si:valueXMLList>
- <si:unitXMLList>\metre\metre</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.0 0.0</si:valueXMLList>
- <si:unitXMLList>\metre</si:unitXMLList>
- </si:covarianceXMLList>
- </si:columnXMLList>
- <si:columnXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.5 0.5</si:valueXMLList>
- <si:unitXMLList>\metre</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.0 0.0</si:valueXMLList>
- <si:unitXMLList>\one</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.5 0.5</si:valueXMLList>
- <si:unitXMLList>\metre</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.0 0.0</si:valueXMLList>
- <si:unitXMLList>\one</si:unitXMLList>
- </si:covarianceXMLList>
- </si:columnXMLList>
- </si:covarianceMatrixXMLList>
- <si:coverageFactorXMLList>1.96 2.00</si:coverageFactorXMLList>
- <si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList>
- <si:distributionXMLList>normal real</si:distributionXMLList>
- </si:mUncMultivarEllipsoidalXMLList>
+ <si:measurementUncertaintyMultivariateXMLList>
+ <si:ellipsoidalRegionMUXMLList>
+ <si:covarianceMatrixXMLList>
+ <si:columnXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.5 0.5</si:valueXMLList>
+ <si:unitXMLList>\metre\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.0 0.0</si:valueXMLList>
+ <si:unitXMLList>\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.5 0.5</si:valueXMLList>
+ <si:unitXMLList>\metre\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.0 0.0</si:valueXMLList>
+ <si:unitXMLList>\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ </si:columnXMLList>
+ <si:columnXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.5 0.5</si:valueXMLList>
+ <si:unitXMLList>\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.0 0.0</si:valueXMLList>
+ <si:unitXMLList>\one</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.5 0.5</si:valueXMLList>
+ <si:unitXMLList>\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.0 0.0</si:valueXMLList>
+ <si:unitXMLList>\one</si:unitXMLList>
+ </si:covarianceXMLList>
+ </si:columnXMLList>
+ <si:columnXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.5 0.5</si:valueXMLList>
+ <si:unitXMLList>\metre\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.0 0.0</si:valueXMLList>
+ <si:unitXMLList>\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.5 0.5</si:valueXMLList>
+ <si:unitXMLList>\metre\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.0 0.0</si:valueXMLList>
+ <si:unitXMLList>\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ </si:columnXMLList>
+ <si:columnXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.5 0.5</si:valueXMLList>
+ <si:unitXMLList>\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.0 0.0</si:valueXMLList>
+ <si:unitXMLList>\one</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.5 0.5</si:valueXMLList>
+ <si:unitXMLList>\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.0 0.0</si:valueXMLList>
+ <si:unitXMLList>\one</si:unitXMLList>
+ </si:covarianceXMLList>
+ </si:columnXMLList>
+ </si:covarianceMatrixXMLList>
+ <si:coverageFactorXMLList>1.96 2.00</si:coverageFactorXMLList>
+ <si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList>
+ <si:distributionXMLList>normal real</si:distributionXMLList>
+ </si:ellipsoidalRegionMUXMLList>
+ </si:measurementUncertaintyMultivariateXMLList>
</si:complexListXMLList>
</siTest:testData>
@@ -289,33 +311,35 @@
<si:realListXMLList>
<si:valueXMLList>1.0 2.0</si:valueXMLList>
<si:unitXMLList>\metre</si:unitXMLList>
- <si:mUncMultivarRectangularXMLList>
- <si:covarianceMatrixXMLList>
- <si:columnXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.5 0.5</si:valueXMLList>
- <si:unitXMLList>\metre\metre</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.0 0.0</si:valueXMLList>
- <si:unitXMLList>\metre\metre</si:unitXMLList>
- </si:covarianceXMLList>
- </si:columnXMLList>
- <si:columnXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.5 0.5</si:valueXMLList>
- <si:unitXMLList>\metre\metre</si:unitXMLList>
- </si:covarianceXMLList>
- <si:covarianceXMLList>
- <si:valueXMLList>0.0 0.0</si:valueXMLList>
- <si:unitXMLList>\metre\metre</si:unitXMLList>
- </si:covarianceXMLList>
- </si:columnXMLList>
- </si:covarianceMatrixXMLList>
- <si:coverageFactorXMLList>1.96</si:coverageFactorXMLList>
- <si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList>
- <si:distributionXMLList>normal</si:distributionXMLList>
- </si:mUncMultivarRectangularXMLList>
+ <si:measurementUncertaintyMultivariateXMLList>
+ <si:rectangularRegionMUXMLList>
+ <si:covarianceMatrixXMLList>
+ <si:columnXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.5 0.5</si:valueXMLList>
+ <si:unitXMLList>\metre\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.0 0.0</si:valueXMLList>
+ <si:unitXMLList>\metre\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ </si:columnXMLList>
+ <si:columnXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.5 0.5</si:valueXMLList>
+ <si:unitXMLList>\metre\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ <si:covarianceXMLList>
+ <si:valueXMLList>0.0 0.0</si:valueXMLList>
+ <si:unitXMLList>\metre\metre</si:unitXMLList>
+ </si:covarianceXMLList>
+ </si:columnXMLList>
+ </si:covarianceMatrixXMLList>
+ <si:coverageFactorXMLList>1.96</si:coverageFactorXMLList>
+ <si:coverageProbabilityXMLList>0.95</si:coverageProbabilityXMLList>
+ <si:distributionXMLList>normal</si:distributionXMLList>
+ </si:rectangularRegionMUXMLList>
+ </si:measurementUncertaintyMultivariateXMLList>
</si:realListXMLList>
</siTest:testData>
diff --git a/examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml b/examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml
index 08c8bbd..0fbe698 100644
--- a/examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml
+++ b/examples/SILVER/2021-11-22-SILVER-examples-xmllists.xml
@@ -67,7 +67,7 @@
<siTest:testData id="PTB662">
<si:realListXMLList>
- <si:quantityTypeXMLList>mass volume</si:quantityTypeXMLList>
+ <si:quantityTypeQUDTXMLList>mass volume</si:quantityTypeQUDTXMLList>
<si:valueXMLList>1.0 1.0</si:valueXMLList>
<si:unitXMLList>\tonne \litre</si:unitXMLList>
</si:realListXMLList>
--
GitLab