Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
xsd-d-si
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
D-PTB
D-SI
xsd-d-si
Commits
c89169f6
Commit
c89169f6
authored
6 years ago
by
Daniel Hutzschenreuter
Browse files
Options
Downloads
Patches
Plain Diff
Update of list structure, hybrid und constant element.
Signed-off-by:
hutzsc01
<
Daniel.Hutzschenreuter@ptb.de
>
parent
a82593ef
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
README.md
+11
-1
11 additions, 1 deletion
README.md
SI_Format.xsd
+135
-61
135 additions, 61 deletions
SI_Format.xsd
examples/SI_Format_TestData.xsd
+2
-4
2 additions, 4 deletions
examples/SI_Format_TestData.xsd
examples/SmartCom_A1.2.3_examples.xml
+3
-3
3 additions, 3 deletions
examples/SmartCom_A1.2.3_examples.xml
with
151 additions
and
69 deletions
README.md
+
11
−
1
View file @
c89169f6
...
@@ -34,6 +34,16 @@ Schema files and instance examples for the XML implementation of the Digital Sys
...
@@ -34,6 +34,16 @@ Schema files and instance examples for the XML implementation of the Digital Sys
-
checked the definition of the atomic list
-
checked the definition of the atomic list
-
in list, the new first component is the label
-
in list, the new first component is the label
-
added a new element for global univariate and global bivariate uncertainty sub types for lists
-
added a new element for global univariate and global bivariate uncertainty sub types for lists of real
*2019-06-13*
-
updated SI test scheme to new namespace and removed reference to comma separated types
-
added new structure with global units and global bivariate uncertainty for list of complex
-
change position of global label element in list
-
added definition of recursive list of lists
-
update of definition of constant quantity and change of position in xsd
-
removed XML adapter in hybrid
This diff is collapsed.
Click to expand it.
SI_Format.xsd
+
135
−
61
View file @
c89169f6
<?xml version="1.1" encoding="UTF-8"?>
<?xml version="1.1" encoding="UTF-8"?>
<xs:schema
version=
"1.2.0"
xmlns:xs=
"http://www.w3.org/2001/XMLSchema"
<xs:schema
version=
"1.2.0"
xmlns:xs=
"http://www.w3.org/2001/XMLSchema"
targetNamespace=
"https://
www.
ptb.de/si/smartcom/d-si/v1_2_0"
targetNamespace=
"https://ptb.de/si/smartcom/d-si/v1_2_0"
xmlns:si=
"https://
www.
ptb.de/si/smartcom/d-si/v1_2_0"
xmlns:si=
"https://ptb.de/si/smartcom/d-si/v1_2_0"
elementFormDefault=
"qualified"
>
elementFormDefault=
"qualified"
>
<!--
<!--
XML-schema implementation of the unified SmartCom meta data format for the exchange of measurement data
XML-schema implementation of the unified SmartCom meta data format for the exchange of measurement data
...
@@ -133,6 +133,46 @@
...
@@ -133,6 +133,46 @@
</xs:element>
</xs:element>
<!--
The definition of a element for constants in the context of the
meta-data format: The following constants are considered:
1.) Fundamental physical constants and key-values with empirical standard deviation for uncertainty
2.) Values of mathematical constants. If such a constant can only be provided in finite precision,
then a rounding error can be provided as uncertainty.
-->
<xs:element
name=
"constant"
>
<xs:complexType>
<xs:annotation>
<xs:documentation>
Implementation of the representation of fundamental physical constants
and mathematical constants.
</xs:documentation>
</xs:annotation>
<xs:sequence>
<!-- optional label -->
<xs:element
name=
"label"
type=
"xs:string"
minOccurs=
"0"
/>
<!-- mandatory information -->
<xs:element
name=
"value"
type=
"si:decimalType"
/>
<xs:element
name=
"unit"
type=
"xs:string"
/>
<!-- optional time stamp -->
<xs:element
name=
"dateTime"
type=
"xs:dateTime"
minOccurs=
"0"
/>
<!-- optional uncertainty -->
<xs:element
name=
"uncertainty"
type=
"si:uncertaintyValueType"
minOccurs=
"0"
/>
<!-- optional distribution -->
<xs:element
name=
"distribution"
type=
"xs:string"
minOccurs=
"0"
/>
</xs:sequence>
</xs:complexType>
</xs:element>
<!--
<!--
Meta data element definition for a complex measurement quantity.
Meta data element definition for a complex measurement quantity.
...
@@ -161,7 +201,7 @@
...
@@ -161,7 +201,7 @@
Polar coordinate form:
Polar coordinate form:
(m) value1 .. amplitude value
(m) value1 .. amplitude value
(m) value2 .. phase angle value
(m) value2 .. phase angle value
(m) unit .. unit of aplitude
(m) unit .. unit of a
m
plitude
(m) unitPhase .. unit of phase angle (must be an angle)
(m) unitPhase .. unit of phase angle (must be an angle)
2. Measured quantity with ellipsoid coverage region
2. Measured quantity with ellipsoid coverage region
...
@@ -336,13 +376,6 @@
...
@@ -336,13 +376,6 @@
3: A recursive list of si:list elements
3: A recursive list of si:list elements
- optional global timestamp and global label
- optional global timestamp and global label
4: A si:realCS element with a comma separated vector of real quantities
- optional global label
- optional multivariate hyper-elliptical or hyper-rectangular coverage region
5: A si:complexCS element with a comma separated vector of real quantities
- optional global label
- optional multivariate hyper-elliptical or hyper-rectangular coverage region
Example (list with local units):
Example (list with local units):
<si:list>
<si:list>
...
@@ -383,19 +416,19 @@
...
@@ -383,19 +416,19 @@
<xs:sequence>
<xs:sequence>
<!-- optional global label of the list -->
<xs:element
name=
"label"
type=
"xs:string"
minOccurs=
"0"
/>
<!-- collection of measured quantities -->
<!-- collection of measured quantities -->
<xs:choice>
<xs:choice>
<!--
<!--
### Definition 1:
### Definition 1:
### list of real elements with
### list of real elements with
### - optional global label, timestamp, unit, unit and uncertainty
### - optional global label, timestamp, unit, unit and uncertainty
-->
-->
<xs:sequence>
<xs:sequence>
<!-- optional global label of the list -->
<xs:element
name=
"label"
type=
"xs:string"
minOccurs=
"0"
/>
<!-- mandatory list of real elements -->
<!-- mandatory list of real elements -->
<xs:element
name=
"real"
maxOccurs=
"unbounded"
>
<xs:element
name=
"real"
maxOccurs=
"unbounded"
>
<xs:complexType>
<xs:complexType>
...
@@ -411,7 +444,7 @@
...
@@ -411,7 +444,7 @@
<!-- optional local timestamp -->
<!-- optional local timestamp -->
<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
local
uncertainty statements -->
<xs:choice
minOccurs=
"0"
>
<xs:choice
minOccurs=
"0"
>
<xs:element
ref=
"si:expandedUnc"
/>
<xs:element
ref=
"si:expandedUnc"
/>
<xs:element
ref=
"si:coverageInterval"
/>
<xs:element
ref=
"si:coverageInterval"
/>
...
@@ -437,11 +470,91 @@
...
@@ -437,11 +470,91 @@
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:sequence>
<!--
### Definition 2:
### list of complex elements with
### - optional global label, time stamp, unit(s), unit(s) and bivariate uncertainty
-->
<xs:sequence>
<!-- mandatory list of complex elements -->
<xs:element
name=
"complex"
maxOccurs=
"unbounded"
>
<xs:complexType>
<xs:sequence>
<!-- optional local label -->
<xs:element
name=
"label"
type=
"xs:string"
minOccurs=
"0"
/>
<!-- choice of Cartesian coordinate form or polar coordinate form -->
<xs:choice>
<xs:sequence>
<!-- mandatory components of Cartesian coordinate form -->
<xs:element
name=
"valueReal"
type=
"si:decimalType"
/>
<xs:element
name=
"valueImag"
type=
"si:decimalType"
/>
<!-- if global unit, then do not write this local unit -->
<xs:element
name=
"unit"
type=
"xs:string"
minOccurs=
"0"
/>
</xs:sequence>
<xs:sequence>
<!-- mandatory components of polar coordinate form -->
<xs:element
name=
"valueAmplitude"
type=
"si:decimalType"
/>
<xs:element
name=
"valuePhase"
type=
"si:decimalType"
/>
<!-- if global unit, then do not write this local unit -->
<xs:element
name=
"unit"
type=
"xs:string"
minOccurs=
"0"
/>
<!-- if global unit, then do not write this local unit -->
<xs:element
name=
"unitPhase"
type=
"xs:string"
minOccurs=
"0"
/>
</xs:sequence>
</xs:choice>
<!-- optional local timestamp -->
<xs:element
name=
"dateTime"
type=
"xs:dateTime"
minOccurs=
"0"
/>
<!-- optional choice of local uncertainty statements -->
<xs:choice
minOccurs=
"0"
>
<xs:element
ref=
"si:ellipsoidalRegion"
/>
<xs:element
ref=
"si:rectangularRegion"
/>
</xs:choice>
</xs:sequence>
</xs:complexType>
</xs:element>
<!-- optional global time stamp -->
<xs:element
name=
"dateTime"
type=
"xs:dateTime"
minOccurs=
"0"
/>
<!-- optional global unit(s) -->
<xs:element
name=
"globalUnit"
type=
"xs:string"
minOccurs=
"0"
/>
<xs:element
name=
"globalUnitPhase"
type=
"xs:string"
minOccurs=
"0"
/>
<!-- optional global bivariate uncertainty -->
<xs:element
ref=
"si:globalBivariateUnc"
minOccurs=
"0"
/>
<!-- optional multivariate uncertainty statement -->
<xs:choice
minOccurs=
"0"
>
<xs:element
ref=
"si:ellipsoidalRegion"
/>
<xs:element
ref=
"si:rectangularRegion"
/>
</xs:choice>
</xs:sequence>
<!--
### Definition 3:
### list of list elements with
### - optional global label and time stamp
-->
<xs:sequence>
<!-- mandatory list of complex elements -->
<xs:element
ref=
"si:list"
maxOccurs=
"unbounded"
/>
<!-- optional global time stamp -->
<xs:element
name=
"dateTime"
type=
"xs:dateTime"
minOccurs=
"0"
/>
</xs:sequence>
</xs:choice>
</xs:choice>
...
@@ -477,44 +590,7 @@
...
@@ -477,44 +590,7 @@
</xs:element>
</xs:element>
<!--
The definition of a element for constants in the context of the
meta-data format: The following constants are considered:
1.) Fundamental physical constants and key-values with empirical standard deviation for uncertainty
2.) Values of mathematical constants. If such a constant can only be provided in finite precision,
then a rounding error can be provided as uncertainty.
-->
<xs:element
name=
"constant"
>
<xs:complexType>
<xs:annotation>
<xs:documentation>
Implementation of the representation of fundamental physical constants
and mathematical constants.
</xs:documentation>
</xs:annotation>
<xs:sequence>
<!-- mandatory information -->
<xs:element
name=
"value"
type=
"si:decimalType"
/>
<xs:element
name=
"unit"
type=
"xs:string"
/>
<!-- optional label -->
<xs:element
name=
"label"
type=
"xs:string"
minOccurs=
"0"
/>
<!-- optional timestamp -->
<xs:element
name=
"dateTime"
type=
"xs:dateTime"
minOccurs=
"0"
/>
<!-- optional uncertainty -->
<xs:element
name=
"uncertainty"
type=
"si:uncertaintyValueType"
minOccurs=
"0"
/>
<!-- optional distribution -->
<xs:element
name=
"distribution"
type=
"xs:string"
minOccurs=
"0"
/>
</xs:sequence>
</xs:complexType>
</xs:element>
...
@@ -563,8 +639,6 @@
...
@@ -563,8 +639,6 @@
<xs:element
ref=
"si:list"
minOccurs=
"1"
maxOccurs=
"unbounded"
/>
<xs:element
ref=
"si:list"
minOccurs=
"1"
maxOccurs=
"unbounded"
/>
</xs:choice>
</xs:choice>
<!-- optional adapter for any other user specific XML structure elements -->
<xs:any
minOccurs=
"0"
namespace=
"##other"
/>
</xs:sequence>
</xs:sequence>
</xs:complexType>
</xs:complexType>
...
...
This diff is collapsed.
Click to expand it.
examples/SI_Format_TestData.xsd
+
2
−
4
View file @
c89169f6
...
@@ -2,9 +2,9 @@
...
@@ -2,9 +2,9 @@
<xs:schema
xmlns:xs=
"http://www.w3.org/2001/XMLSchema"
<xs:schema
xmlns:xs=
"http://www.w3.org/2001/XMLSchema"
targetNamespace=
"https://gitlab1.ptb.de/D-SI-public/xml/tree/master/SI-Test"
targetNamespace=
"https://gitlab1.ptb.de/D-SI-public/xml/tree/master/SI-Test"
xmlns:siTest=
"https://gitlab1.ptb.de/D-SI-public/xml/tree/master/SI-Test"
xmlns:siTest=
"https://gitlab1.ptb.de/D-SI-public/xml/tree/master/SI-Test"
xmlns:si=
"https://
gitlab1.ptb.de/D-SI-public/xml/tree/master/SI
"
xmlns:si=
"https://
ptb.de/si/smartcom/d-si/v1_2_0
"
elementFormDefault=
"qualified"
>
elementFormDefault=
"qualified"
>
<xs:import
namespace=
"https://
gitlab1.ptb.de/D-SI-public/xml/tree/master/SI
"
<xs:import
namespace=
"https://
ptb.de/si/smartcom/d-si/v1_2_0
"
schemaLocation=
"platform:/resource/DSI_XML_Tools/xml/SI_Format.xsd"
/>
schemaLocation=
"platform:/resource/DSI_XML_Tools/xml/SI_Format.xsd"
/>
<!-- A simple XML scheme for maintaining multiple XML test examples
<!-- A simple XML scheme for maintaining multiple XML test examples
...
@@ -34,8 +34,6 @@
...
@@ -34,8 +34,6 @@
<xs:element
ref=
"si:real"
/>
<xs:element
ref=
"si:real"
/>
<xs:element
ref=
"si:complex"
/>
<xs:element
ref=
"si:complex"
/>
<xs:element
ref=
"si:list"
/>
<xs:element
ref=
"si:list"
/>
<xs:element
ref=
"si:realCS"
/>
<xs:element
ref=
"si:complexCS"
/>
<xs:element
ref=
"si:constant"
/>
<xs:element
ref=
"si:constant"
/>
<xs:element
ref=
"si:hybrid"
/>
<xs:element
ref=
"si:hybrid"
/>
</xs:choice>
</xs:choice>
...
...
This diff is collapsed.
Click to expand it.
examples/SmartCom_A1.2.3_examples.xml
+
3
−
3
View file @
c89169f6
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<siTest:testDSIXML
<siTest:testDSIXML
xmlns:siTest=
"https://gitlab1.ptb.de/D-SI-public/xml/tree/master/SI-Test"
xmlns:siTest=
"https://gitlab1.ptb.de/D-SI-public/xml/tree/master/SI-Test"
xmlns:si=
"https://
gitlab1.ptb.de/D-SI-public/xml/tree/master/SI
"
xmlns:si=
"https://
ptb.de/si/smartcom/d-si/v1_2_0
"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"https://
gitlab1.ptb.de/D-SI-public/xml/tree/master/SI
platform:/resource/DSI_XML_Tools/xml/SI_Format.xsd
xsi:schemaLocation=
"https://
ptb.de/si/smartcom/d-si/v1_2_0
platform:/resource/DSI_XML_Tools/xml/SI_Format.xsd
https://gitlab1.ptb.de/D-SI-public/xml/tree/master/SI-Test platform:/resource/DSI_XML_Tools/
src/de/ptb/smartcom/xml/validation
/SI_Format_TestData.xsd"
>
https://gitlab1.ptb.de/D-SI-public/xml/tree/master/SI-Test platform:/resource/DSI_XML_Tools/
xml/examples
/SI_Format_TestData.xsd"
>
<!-- einfache Beschreibung -->
<!-- einfache Beschreibung -->
<siTest:metaData>
<siTest:metaData>
<siTest:testDescription>
Update XML examples for SmartCom metadata format version 1.2.
</siTest:testDescription>
<siTest:testDescription>
Update XML examples for SmartCom metadata format version 1.2.
</siTest:testDescription>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment