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
d439d3d2
Commit
d439d3d2
authored
2 years ago
by
Daniel Hutzschenreuter
Browse files
Options
Downloads
Patches
Plain Diff
Update NaN und Start Quantity
parent
e0165ccc
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
SI_Format.xsd
+17
-4
17 additions, 4 deletions
SI_Format.xsd
examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml
+3
-3
3 additions, 3 deletions
examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml
examples/SI_Format_TestData.xsd
+1
-0
1 addition, 0 deletions
examples/SI_Format_TestData.xsd
with
21 additions
and
7 deletions
SI_Format.xsd
+
17
−
4
View file @
d439d3d2
...
@@ -41,7 +41,20 @@
...
@@ -41,7 +41,20 @@
<!-- ToDo: Check if needed and remove if not needed -->
<!-- ToDo: Check if needed and remove if not needed -->
<xs:import
namespace=
"http://qudt.org/vocab/"
schemaLocation=
"qudt/quantityKind.xsd"
/>
<xs:import
namespace=
"http://qudt.org/vocab/"
schemaLocation=
"qudt/quantityKind.xsd"
/>
<xs:element
name=
"quantityType"
type=
"qudt:quantityKind"
/>
<xs:element
name=
"quantityType"
type=
"xs:string"
abstract=
"true"
/>
<xs:element
name=
"quantityTypeQUDT"
substitutionGroup=
"si:quantityType"
type=
"qudt:quantityKind"
/>
<!--<xs:element name="quantityTypeIEC" substitutionGroup="si:quantityType"/>-->
<!-- xs:anyURI -->
<xs:element
name=
"real2"
>
<xs:complexType>
<xs:sequence>
<xs:element
ref=
"si:quantityType"
/>
</xs:sequence>
</xs:complexType>
</xs:element>
<!-- ############## D-SI XML ELEMENT DEFINITIONS FOR MEASUREMETN DATA EXCHANGE #################### -->
<!-- ############## D-SI XML ELEMENT DEFINITIONS FOR MEASUREMETN DATA EXCHANGE #################### -->
...
@@ -102,7 +115,7 @@
...
@@ -102,7 +115,7 @@
<!-- optional label and quantity type-->
<!-- optional label and quantity type-->
<xs:element
name=
"label"
type=
"xs:string"
minOccurs=
"0"
/>
<xs:element
name=
"label"
type=
"xs:string"
minOccurs=
"0"
/>
<!-- check this line -->
<!-- check this line -->
<xs:element
name=
"
quantityType"
type=
"qudt:quantityKind"
minOccurs=
"0"
/>
<xs:element
ref=
"si:
quantityType"
minOccurs=
"0"
/>
<!-- mandatory information -->
<!-- mandatory information -->
<xs:element
name=
"value"
type=
"si:decimalType"
/>
<xs:element
name=
"value"
type=
"si:decimalType"
/>
...
@@ -1244,7 +1257,7 @@
...
@@ -1244,7 +1257,7 @@
</xs:documentation>
</xs:documentation>
</xs:annotation>
</xs:annotation>
<xs:restriction
base=
"xs:double"
>
<xs:restriction
base=
"xs:double"
>
<xs:pattern
value=
"\+?(([1-9]\d*\.\d*)|([1-9]\d*))"
/>
<xs:pattern
value=
"\+?(([1-9]\d*\.\d*)|([1-9]\d*))
|NaN
"
/>
</xs:restriction>
</xs:restriction>
</xs:simpleType>
</xs:simpleType>
...
@@ -1270,7 +1283,7 @@
...
@@ -1270,7 +1283,7 @@
</xs:documentation>
</xs:documentation>
</xs:annotation>
</xs:annotation>
<xs:restriction
base=
"xs:double"
>
<xs:restriction
base=
"xs:double"
>
<xs:pattern
value=
"\+?((0(\.\d*)?)|(1(\.0*)?))"
/>
<xs:pattern
value=
"\+?((0(\.\d*)?)|(1(\.0*)?))
|NaN
"
/>
</xs:restriction>
</xs:restriction>
</xs:simpleType>
</xs:simpleType>
...
...
This diff is collapsed.
Click to expand it.
examples/PLATINUM/2023-03-31-PLATINUM-examples-1.xml
+
3
−
3
View file @
d439d3d2
...
@@ -33,13 +33,13 @@
...
@@ -33,13 +33,13 @@
<siTest:testData
id=
"PTB800"
>
<siTest:testData
id=
"PTB800"
>
<si:real>
<si:real>
<si:quantityType>
length
</si:quantityType>
<si:quantityType
QUDT
>
length
</si:quantityType
QUDT
>
<si:value>
NaN
</si:value>
<si:value>
NaN
</si:value>
<si:unit>
\metre
</si:unit>
<si:unit>
\metre
</si:unit>
<si:expandedUnc>
<si:expandedUnc>
<si:uncertainty>
NaN
</si:uncertainty>
<si:uncertainty>
NaN
</si:uncertainty>
<si:coverageFactor>
1.96
</si:coverageFactor>
<si:coverageFactor>
NaN
</si:coverageFactor>
<si:coverageProbability>
0.95
</si:coverageProbability>
<si:coverageProbability>
NaN
</si:coverageProbability>
</si:expandedUnc>
</si:expandedUnc>
</si:real>
</si:real>
</siTest:testData>
</siTest:testData>
...
...
This diff is collapsed.
Click to expand it.
examples/SI_Format_TestData.xsd
+
1
−
0
View file @
d439d3d2
...
@@ -67,6 +67,7 @@
...
@@ -67,6 +67,7 @@
<xs:sequence>
<xs:sequence>
<xs:choice>
<xs:choice>
<xs:element
ref=
"si:real"
/>
<xs:element
ref=
"si:real"
/>
<xs:element
ref=
"si:real2"
/>
<xs:element
ref=
"si:complex"
/>
<xs:element
ref=
"si:complex"
/>
<xs:element
ref=
"si:list"
/>
<xs:element
ref=
"si:list"
/>
<xs:element
ref=
"si:realList"
/>
<xs:element
ref=
"si:realList"
/>
...
...
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