Bob DuCharme

Merge branch 'master' of github.com:TopQuadrant/EPIM-Ontologies

...@@ -131,6 +131,11 @@ ep-core:MassOrVolumicConcentration ...@@ -131,6 +131,11 @@ ep-core:MassOrVolumicConcentration
131 rdf:type rdfs:Class ; 131 rdf:type rdfs:Class ;
132 rdfs:subClassOf ep-core:DimensionlessMeasure . 132 rdfs:subClassOf ep-core:DimensionlessMeasure .
133 133
134 +ep-core:MassPair
135 + rdf:type owl:Class ;
136 + rdfs:label "mass pair"^^xsd:string ;
137 + rdfs:subClassOf ep-core:Pair .
138 +
134 ep-core:MassPerLength 139 ep-core:MassPerLength
135 rdf:type rdfs:Class ; 140 rdf:type rdfs:Class ;
136 rdfs:subClassOf owl:Class . 141 rdfs:subClassOf owl:Class .
...@@ -145,6 +150,11 @@ ep-core:MassPerUnitMassConcentration ...@@ -145,6 +150,11 @@ ep-core:MassPerUnitMassConcentration
145 rdfs:label "mass per unit mass concentration"^^xsd:string ; 150 rdfs:label "mass per unit mass concentration"^^xsd:string ;
146 rdfs:subClassOf owl:Class . 151 rdfs:subClassOf owl:Class .
147 152
153 +ep-core:MassVolumePair
154 + rdf:type owl:Class ;
155 + rdfs:label "mass volume pair"^^xsd:string ;
156 + rdfs:subClassOf ep-core:Pair .
157 +
148 ep-core:MeasureOfAmountOfMaterial 158 ep-core:MeasureOfAmountOfMaterial
149 rdf:type ep-core:PropertySpace , rdfs:Class ; 159 rdf:type ep-core:PropertySpace , rdfs:Class ;
150 rdfs:label "measure of amount of material"^^xsd:string ; 160 rdfs:label "measure of amount of material"^^xsd:string ;
...@@ -190,6 +200,11 @@ ep-core:NormalStress ...@@ -190,6 +200,11 @@ ep-core:NormalStress
190 rdfs:label "Normal Stress"^^xsd:string ; 200 rdfs:label "Normal Stress"^^xsd:string ;
191 rdfs:subClassOf ep-core:EnergyPerVolume . 201 rdfs:subClassOf ep-core:EnergyPerVolume .
192 202
203 +ep-core:Pair
204 + rdf:type owl:Class ;
205 + rdfs:label "pair"^^xsd:string ;
206 + rdfs:subClassOf owl:Thing .
207 +
193 ep-core:PerLength 208 ep-core:PerLength
194 rdf:type rdfs:Class ; 209 rdf:type rdfs:Class ;
195 rdfs:subClassOf owl:Class . 210 rdfs:subClassOf owl:Class .
...@@ -424,6 +439,11 @@ ep-core:VolumeMassRatio ...@@ -424,6 +439,11 @@ ep-core:VolumeMassRatio
424 rdfs:label "volume mass ratio"^^xsd:string ; 439 rdfs:label "volume mass ratio"^^xsd:string ;
425 rdfs:subClassOf owl:Class . 440 rdfs:subClassOf owl:Class .
426 441
442 +ep-core:VolumePair
443 + rdf:type owl:Class ;
444 + rdfs:label "volume pair"^^xsd:string ;
445 + rdfs:subClassOf ep-core:Pair .
446 +
427 ep-core:VolumePerUnitVolumeConcentration 447 ep-core:VolumePerUnitVolumeConcentration
428 rdf:type ep-core:PropertySpace , rdfs:Class ; 448 rdf:type ep-core:PropertySpace , rdfs:Class ;
429 rdfs:label "volume per unit volume concentration"^^xsd:string ; 449 rdfs:label "volume per unit volume concentration"^^xsd:string ;
...@@ -1097,6 +1117,12 @@ ep-core:description ...@@ -1097,6 +1117,12 @@ ep-core:description
1097 rdfs:comment "description of a thing"^^xsd:string ; 1117 rdfs:comment "description of a thing"^^xsd:string ;
1098 rdfs:label "description"^^xsd:string . 1118 rdfs:label "description"^^xsd:string .
1099 1119
1120 +ep-core:divide
1121 + rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
1122 + rdfs:domain ep-core:Pair ;
1123 + rdfs:label "divide"^^xsd:string ;
1124 + rdfs:range owl:Thing .
1125 +
1100 ep-core:dm3 1126 ep-core:dm3
1101 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 1127 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
1102 rdfs:domain ep-core:MeasureOfAmountOfMaterial ; 1128 rdfs:domain ep-core:MeasureOfAmountOfMaterial ;
...@@ -1250,6 +1276,12 @@ ep-core:femtometre ...@@ -1250,6 +1276,12 @@ ep-core:femtometre
1250 ep-core:seeReferenceData 1276 ep-core:seeReferenceData
1251 "http://posccaesar.org/rdl/RDS17272735"^^xsd:string . 1277 "http://posccaesar.org/rdl/RDS17272735"^^xsd:string .
1252 1278
1279 +ep-core:firstOfPair
1280 + rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
1281 + rdfs:domain ep-core:Pair ;
1282 + rdfs:label "first of pair"^^xsd:string ;
1283 + rdfs:range owl:Thing .
1284 +
1253 ep-core:foot 1285 ep-core:foot
1254 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ; 1286 rdf:type ep-core:Scale , owl:DatatypeProperty , owl:FunctionalProperty ;
1255 rdfs:domain ep-core:Length ; 1287 rdfs:domain ep-core:Length ;
...@@ -3904,6 +3936,12 @@ ep-core:second-A ...@@ -3904,6 +3936,12 @@ ep-core:second-A
3904 ep-core:seeReferenceData 3936 ep-core:seeReferenceData
3905 "http://posccaesar.org/rdl/RDS1355444"^^xsd:string . 3937 "http://posccaesar.org/rdl/RDS1355444"^^xsd:string .
3906 3938
3939 +ep-core:secondOfPair
3940 + rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
3941 + rdfs:domain ep-core:Pair ;
3942 + rdfs:label "second of pair"^^xsd:string ;
3943 + rdfs:range owl:Thing .
3944 +
3907 ep-core:seeReferenceData 3945 ep-core:seeReferenceData
3908 rdf:type owl:AnnotationProperty . 3946 rdf:type owl:AnnotationProperty .
3909 3947
......
...@@ -17,20 +17,68 @@ ...@@ -17,20 +17,68 @@
17 <http://www.epim.no/schemas/mprml/1#Cs_businessAssociate> 17 <http://www.epim.no/schemas/mprml/1#Cs_businessAssociate>
18 spin:rule 18 spin:rule
19 [ rdf:type sp:Construct ; 19 [ rdf:type sp:Construct ;
20 - rdfs:comment "STEP 90200 Set the approver"^^xsd:string ; 20 + rdfs:comment "STEP 90201 Set the approver"^^xsd:string ;
21 sp:templates ([ sp:object _:b1 ; 21 sp:templates ([ sp:object _:b1 ;
22 + sp:predicate <http://www.reportinghub.no/ep/schema/activity#issuer> ;
23 + sp:subject
24 + [ sp:varName "issueReport"^^xsd:string
25 + ]
26 + ] [ sp:object <http://www.reportinghub.no/ep/schema/organization#PersonOrOrganization> ;
27 + sp:predicate rdf:type ;
28 + sp:subject _:b1
29 + ] [ sp:object
30 + [ sp:varName "issuer"^^xsd:string
31 + ] ;
32 + sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
33 + sp:subject _:b1
34 + ]) ;
35 + sp:where ([ sp:object spin:_this ;
36 + sp:predicate <http://www.epim.no/schemas/mprml/1#issuedByRef> ;
37 + sp:subject
38 + [ sp:varName "target"^^xsd:string
39 + ]
40 + ] [ sp:object
41 + [ sp:varName "target"^^xsd:string
42 + ] ;
43 + sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
44 + sp:subject
45 + [ sp:varName "report"^^xsd:string
46 + ]
47 + ] [ sp:object
48 + [ sp:varName "report"^^xsd:string
49 + ] ;
50 + sp:predicate <http://www.reportinghub.no/ep/schema/report#issuedReport> ;
51 + sp:subject
52 + [ sp:varName "issueReport"^^xsd:string
53 + ]
54 + ] [ sp:object <http://www.reportinghub.no/ep/schema/activity#IssueAReport> ;
55 + sp:predicate rdf:type ;
56 + sp:subject
57 + [ sp:varName "issueReport"^^xsd:string
58 + ]
59 + ] [ sp:object spin:_this ;
60 + sp:predicate <http://www.reportinghub.no/ep/transform/transform-helper-schema#derivedFrom> ;
61 + sp:subject
62 + [ sp:varName "issuer"^^xsd:string
63 + ]
64 + ])
65 + ] ;
66 + spin:rule
67 + [ rdf:type sp:Construct ;
68 + rdfs:comment "STEP 90200 Set the approver"^^xsd:string ;
69 + sp:templates ([ sp:object _:b2 ;
22 sp:predicate <http://www.reportinghub.no/ep/schema/activity#approver> ; 70 sp:predicate <http://www.reportinghub.no/ep/schema/activity#approver> ;
23 sp:subject 71 sp:subject
24 [ sp:varName "approveReport"^^xsd:string 72 [ sp:varName "approveReport"^^xsd:string
25 ] 73 ]
26 ] [ sp:object <http://www.reportinghub.no/ep/schema/organization#PersonOrOrganization> ; 74 ] [ sp:object <http://www.reportinghub.no/ep/schema/organization#PersonOrOrganization> ;
27 sp:predicate rdf:type ; 75 sp:predicate rdf:type ;
28 - sp:subject _:b1 76 + sp:subject _:b2
29 ] [ sp:object 77 ] [ sp:object
30 [ sp:varName "approver"^^xsd:string 78 [ sp:varName "approver"^^xsd:string
31 ] ; 79 ] ;
32 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 80 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
33 - sp:subject _:b1 81 + sp:subject _:b2
34 ]) ; 82 ]) ;
35 sp:where ([ sp:object spin:_this ; 83 sp:where ([ sp:object spin:_this ;
36 sp:predicate <http://www.epim.no/schemas/mprml/1#approverRef> ; 84 sp:predicate <http://www.epim.no/schemas/mprml/1#approverRef> ;
...@@ -66,5 +114,5 @@ ...@@ -66,5 +114,5 @@
66 114
67 <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-approval-v1.1.1> 115 <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-approval-v1.1.1>
68 rdf:type owl:Ontology ; 116 rdf:type owl:Ontology ;
69 - owl:imports <http://www.reportinghub.no/ep/transform/transform-helper-schema> , <http://www.reportinghub.no/ep/schema/1.0/production-activity> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.epim.no/schemas/mprml/1> , <http://spinrdf.org/spin> ; 117 + owl:imports <http://spinrdf.org/spin> , <http://www.epim.no/schemas/mprml/1> , <http://www.reportinghub.no/ep/schema/1.0/report> , <http://www.reportinghub.no/ep/schema/1.0/production-activity> , <http://www.reportinghub.no/ep/transform/transform-helper-schema> ;
70 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 118 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
......
This diff could not be displayed because it is too large.