David Leal

MPR Density data bug fix

...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 sp:subject _:b1 35 sp:subject _:b1
36 ]) ; 36 ]) ;
37 sp:where ([ sp:object spin:_this ; 37 sp:where ([ sp:object spin:_this ;
38 - sp:predicate <http://www.epim.no/schemas/mprml/1#volumeValueRef> ; 38 + sp:predicate <http://www.epim.no/schemas/mprml/1#densityValueRef> ;
39 sp:subject 39 sp:subject
40 [ sp:varName "target"^^xsd:string 40 [ sp:varName "target"^^xsd:string
41 ] 41 ]
...@@ -71,89 +71,183 @@ ...@@ -71,89 +71,183 @@
71 <http://www.epim.no/schemas/mprml/1#Cs_volumeValue> 71 <http://www.epim.no/schemas/mprml/1#Cs_volumeValue>
72 spin:rule 72 spin:rule
73 [ rdf:type sp:Construct ; 73 [ rdf:type sp:Construct ;
74 + rdfs:comment "STEP 90000 Process volumeValue for a quantityOfMaterial"^^xsd:string ;
75 + sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/material#QuantityOfMaterial> ;
76 + sp:predicate rdf:type ;
77 + sp:subject _:b2
78 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#Fluid> ;
79 + sp:predicate rdf:type ;
80 + sp:subject _:b2
81 + ] [ sp:object
82 + [ sp:varName "quantityOfMaterial"^^xsd:string
83 + ] ;
84 + sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
85 + sp:subject _:b2
86 + ] [ sp:object _:b3 ;
87 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#grossCalorificValue> ;
88 + sp:subject _:b2
89 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#EnergyPerVolume> ;
90 + sp:predicate rdf:type ;
91 + sp:subject _:b3
92 + ] [ sp:object
93 + [ sp:varName "realGrossCalorificValue"^^xsd:string
94 + ] ;
95 + sp:predicate
96 + [ sp:varName "grossCalorificValueScale"^^xsd:string
97 + ] ;
98 + sp:subject _:b3
99 + ] [ sp:object spin:_this ;
100 + sp:predicate <http://www.reportinghub.no/ep/schema/core#derivedFrom> ;
101 + sp:subject _:b2
102 + ]) ;
103 + sp:where ([ sp:object spin:_this ;
104 + sp:predicate <http://www.epim.no/schemas/mprml/1#volumeValueRef> ;
105 + sp:subject
106 + [ sp:varName "target"^^xsd:string
107 + ]
108 + ] [ sp:object
109 + [ sp:varName "target"^^xsd:string
110 + ] ;
111 + sp:predicate <http://www.reportinghub.no/ep/schema/core#derivedFrom> ;
112 + sp:subject
113 + [ sp:varName "quantityOfMaterial"^^xsd:string
114 + ]
115 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#QuantityOfMaterial> ;
116 + sp:predicate rdf:type ;
117 + sp:subject
118 + [ sp:varName "quantityOfMaterial"^^xsd:string
119 + ]
120 + ] [ rdf:type sp:NotExists ;
121 + sp:elements ([ sp:object
122 + [ sp:varName "target"^^xsd:string
123 + ] ;
124 + sp:predicate <http://www.reportinghub.no/ep/schema/core#derivedFrom> ;
125 + sp:subject
126 + [ sp:varName "classOfMaterialWithMassCriterion"^^xsd:string
127 + ]
128 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ClassOfMaterialWithMassCriterion> ;
129 + sp:predicate rdf:type ;
130 + sp:subject
131 + [ sp:varName "classOfMaterialWithMassCriterion"^^xsd:string
132 + ]
133 + ])
134 + ] [ rdf:type sp:Optional ;
135 + sp:elements ([ sp:object
136 + [ sp:varName "grossCalorificValueRef"^^xsd:string
137 + ] ;
138 + sp:predicate <http://www.epim.no/schemas/mprml/1#grossCalorificValueRef> ;
139 + sp:subject spin:_this
140 + ] [ sp:object
141 + [ sp:varName "realGrossCalorificValue"^^xsd:string
142 + ] ;
143 + sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
144 + sp:subject
145 + [ sp:varName "grossCalorificValueRef"^^xsd:string
146 + ]
147 + ] [ sp:object
148 + [ sp:varName "uomGrossCalorificValue"^^xsd:string
149 + ] ;
150 + sp:predicate <http://www.epim.no/schemas/mprml/1#uomRef> ;
151 + sp:subject
152 + [ sp:varName "grossCalorificValueRef"^^xsd:string
153 + ]
154 + ])
155 + ] [ rdf:type sp:Bind ;
156 + sp:expression
157 + [ rdf:type ep-mpr-spin-lib:selectEnergyPerVolumeScale ;
158 + sp:arg1 [ sp:varName "uomGrossCalorificValue"^^xsd:string
159 + ]
160 + ] ;
161 + sp:variable
162 + [ sp:varName "grossCalorificValueScale"^^xsd:string
163 + ]
164 + ])
165 + ] ;
166 + spin:rule
167 + [ rdf:type sp:Construct ;
74 rdfs:comment "STEP 90001 Process volumeValue for a quantityOfMaterial average amount of material"^^xsd:string ; 168 rdfs:comment "STEP 90001 Process volumeValue for a quantityOfMaterial average amount of material"^^xsd:string ;
75 sp:templates ([ sp:object 169 sp:templates ([ sp:object
76 [ sp:varName "classOfMaterialWithMassCriterion"^^xsd:string 170 [ sp:varName "classOfMaterialWithMassCriterion"^^xsd:string
77 ] ; 171 ] ;
78 sp:predicate rdfs:subClassOf ; 172 sp:predicate rdfs:subClassOf ;
79 - sp:subject _:b2 173 + sp:subject _:b4
80 - ] [ sp:object _:b3 ; 174 + ] [ sp:object _:b5 ;
81 sp:predicate rdfs:subClassOf ; 175 sp:predicate rdfs:subClassOf ;
82 - sp:subject _:b2 176 + sp:subject _:b4
83 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Volume> ; 177 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Volume> ;
84 sp:predicate rdf:type ; 178 sp:predicate rdf:type ;
85 - sp:subject _:b3 179 + sp:subject _:b5
86 ] [ sp:object 180 ] [ sp:object
87 [ sp:varName "realVolume"^^xsd:string 181 [ sp:varName "realVolume"^^xsd:string
88 ] ; 182 ] ;
89 sp:predicate 183 sp:predicate
90 [ sp:varName "volumeScale"^^xsd:string 184 [ sp:varName "volumeScale"^^xsd:string
91 ] ; 185 ] ;
92 - sp:subject _:b3 186 + sp:subject _:b5
93 - ] [ sp:object _:b4 ; 187 + ] [ sp:object _:b6 ;
94 sp:predicate rdfs:subClassOf ; 188 sp:predicate rdfs:subClassOf ;
95 - sp:subject _:b2 189 + sp:subject _:b4
96 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Temperature> ; 190 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Temperature> ;
97 sp:predicate rdf:type ; 191 sp:predicate rdf:type ;
98 - sp:subject _:b4 192 + sp:subject _:b6
99 ] [ sp:object 193 ] [ sp:object
100 [ sp:varName "realTemp"^^xsd:string 194 [ sp:varName "realTemp"^^xsd:string
101 ] ; 195 ] ;
102 sp:predicate 196 sp:predicate
103 [ sp:varName "temperatureScale"^^xsd:string 197 [ sp:varName "temperatureScale"^^xsd:string
104 ] ; 198 ] ;
105 - sp:subject _:b4 199 + sp:subject _:b6
106 - ] [ sp:object _:b5 ; 200 + ] [ sp:object _:b7 ;
107 sp:predicate rdfs:subClassOf ; 201 sp:predicate rdfs:subClassOf ;
108 - sp:subject _:b2 202 + sp:subject _:b4
109 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Pressure> ; 203 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Pressure> ;
110 sp:predicate rdf:type ; 204 sp:predicate rdf:type ;
111 - sp:subject _:b5 205 + sp:subject _:b7
112 ] [ sp:object 206 ] [ sp:object
113 [ sp:varName "realPres"^^xsd:string 207 [ sp:varName "realPres"^^xsd:string
114 ] ; 208 ] ;
115 sp:predicate 209 sp:predicate
116 [ sp:varName "pressureScale"^^xsd:string 210 [ sp:varName "pressureScale"^^xsd:string
117 ] ; 211 ] ;
118 - sp:subject _:b5 212 + sp:subject _:b7
119 - ] [ sp:object _:b6 ; 213 + ] [ sp:object _:b8 ;
120 sp:predicate rdfs:subClassOf ; 214 sp:predicate rdfs:subClassOf ;
121 - sp:subject _:b2 215 + sp:subject _:b4
122 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#grossCalorificValue> ; 216 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#grossCalorificValue> ;
123 sp:predicate owl:onProperty ; 217 sp:predicate owl:onProperty ;
124 - sp:subject _:b6 218 + sp:subject _:b8
125 - ] [ sp:object _:b7 ; 219 + ] [ sp:object _:b9 ;
126 sp:predicate owl:allValuesFrom ; 220 sp:predicate owl:allValuesFrom ;
127 - sp:subject _:b6 221 + sp:subject _:b8
128 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#EnergyPerVolume> ; 222 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#EnergyPerVolume> ;
129 sp:predicate rdf:type ; 223 sp:predicate rdf:type ;
130 - sp:subject _:b7 224 + sp:subject _:b9
131 ] [ sp:object 225 ] [ sp:object
132 [ sp:varName "realGrossCalorificValue"^^xsd:string 226 [ sp:varName "realGrossCalorificValue"^^xsd:string
133 ] ; 227 ] ;
134 sp:predicate 228 sp:predicate
135 [ sp:varName "grossCalorificValueScale"^^xsd:string 229 [ sp:varName "grossCalorificValueScale"^^xsd:string
136 ] ; 230 ] ;
137 - sp:subject _:b7 231 + sp:subject _:b9
138 - ] [ sp:object _:b8 ; 232 + ] [ sp:object _:b10 ;
139 sp:predicate rdfs:subClassOf ; 233 sp:predicate rdfs:subClassOf ;
140 - sp:subject _:b2 234 + sp:subject _:b4
141 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#energyContent> ; 235 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#energyContent> ;
142 sp:predicate owl:onProperty ; 236 sp:predicate owl:onProperty ;
143 - sp:subject _:b8 237 + sp:subject _:b10
144 - ] [ sp:object _:b9 ; 238 + ] [ sp:object _:b11 ;
145 sp:predicate owl:allValuesFrom ; 239 sp:predicate owl:allValuesFrom ;
146 - sp:subject _:b8 240 + sp:subject _:b10
147 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Work> ; 241 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Work> ;
148 sp:predicate rdf:type ; 242 sp:predicate rdf:type ;
149 - sp:subject _:b9 243 + sp:subject _:b11
150 ] [ sp:object 244 ] [ sp:object
151 [ sp:varName "realWork"^^xsd:string 245 [ sp:varName "realWork"^^xsd:string
152 ] ; 246 ] ;
153 sp:predicate 247 sp:predicate
154 [ sp:varName "workScale"^^xsd:string 248 [ sp:varName "workScale"^^xsd:string
155 ] ; 249 ] ;
156 - sp:subject _:b9 250 + sp:subject _:b11
157 ]) ; 251 ]) ;
158 sp:where ([ sp:object spin:_this ; 252 sp:where ([ sp:object spin:_this ;
159 sp:predicate <http://www.epim.no/schemas/mprml/1#volumeValueRef> ; 253 sp:predicate <http://www.epim.no/schemas/mprml/1#volumeValueRef> ;
...@@ -321,100 +415,6 @@ ...@@ -321,100 +415,6 @@
321 [ sp:varName "workScale"^^xsd:string 415 [ sp:varName "workScale"^^xsd:string
322 ] 416 ]
323 ]) 417 ])
324 - ] ;
325 - spin:rule
326 - [ rdf:type sp:Construct ;
327 - rdfs:comment "STEP 90000 Process volumeValue for a quantityOfMaterial"^^xsd:string ;
328 - sp:templates ([ sp:object <http://www.reportinghub.no/ep/schema/material#QuantityOfMaterial> ;
329 - sp:predicate rdf:type ;
330 - sp:subject _:b10
331 - ] [ sp:object <http://www.reportinghub.no/ep/schema/material#Fluid> ;
332 - sp:predicate rdf:type ;
333 - sp:subject _:b10
334 - ] [ sp:object
335 - [ sp:varName "quantityOfMaterial"^^xsd:string
336 - ] ;
337 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
338 - sp:subject _:b10
339 - ] [ sp:object _:b11 ;
340 - sp:predicate <http://www.reportinghub.no/ep/schema/flow#grossCalorificValue> ;
341 - sp:subject _:b10
342 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#EnergyPerVolume> ;
343 - sp:predicate rdf:type ;
344 - sp:subject _:b11
345 - ] [ sp:object
346 - [ sp:varName "realGrossCalorificValue"^^xsd:string
347 - ] ;
348 - sp:predicate
349 - [ sp:varName "grossCalorificValueScale"^^xsd:string
350 - ] ;
351 - sp:subject _:b11
352 - ] [ sp:object spin:_this ;
353 - sp:predicate <http://www.reportinghub.no/ep/schema/core#derivedFrom> ;
354 - sp:subject _:b10
355 - ]) ;
356 - sp:where ([ sp:object spin:_this ;
357 - sp:predicate <http://www.epim.no/schemas/mprml/1#volumeValueRef> ;
358 - sp:subject
359 - [ sp:varName "target"^^xsd:string
360 - ]
361 - ] [ sp:object
362 - [ sp:varName "target"^^xsd:string
363 - ] ;
364 - sp:predicate <http://www.reportinghub.no/ep/schema/core#derivedFrom> ;
365 - sp:subject
366 - [ sp:varName "quantityOfMaterial"^^xsd:string
367 - ]
368 - ] [ sp:object <http://www.reportinghub.no/ep/schema/material#QuantityOfMaterial> ;
369 - sp:predicate rdf:type ;
370 - sp:subject
371 - [ sp:varName "quantityOfMaterial"^^xsd:string
372 - ]
373 - ] [ rdf:type sp:NotExists ;
374 - sp:elements ([ sp:object
375 - [ sp:varName "target"^^xsd:string
376 - ] ;
377 - sp:predicate <http://www.reportinghub.no/ep/schema/core#derivedFrom> ;
378 - sp:subject
379 - [ sp:varName "classOfMaterialWithMassCriterion"^^xsd:string
380 - ]
381 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ClassOfMaterialWithMassCriterion> ;
382 - sp:predicate rdf:type ;
383 - sp:subject
384 - [ sp:varName "classOfMaterialWithMassCriterion"^^xsd:string
385 - ]
386 - ])
387 - ] [ rdf:type sp:Optional ;
388 - sp:elements ([ sp:object
389 - [ sp:varName "grossCalorificValueRef"^^xsd:string
390 - ] ;
391 - sp:predicate <http://www.epim.no/schemas/mprml/1#grossCalorificValueRef> ;
392 - sp:subject spin:_this
393 - ] [ sp:object
394 - [ sp:varName "realGrossCalorificValue"^^xsd:string
395 - ] ;
396 - sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
397 - sp:subject
398 - [ sp:varName "grossCalorificValueRef"^^xsd:string
399 - ]
400 - ] [ sp:object
401 - [ sp:varName "uomGrossCalorificValue"^^xsd:string
402 - ] ;
403 - sp:predicate <http://www.epim.no/schemas/mprml/1#uomRef> ;
404 - sp:subject
405 - [ sp:varName "grossCalorificValueRef"^^xsd:string
406 - ]
407 - ])
408 - ] [ rdf:type sp:Bind ;
409 - sp:expression
410 - [ rdf:type ep-mpr-spin-lib:selectEnergyPerVolumeScale ;
411 - sp:arg1 [ sp:varName "uomGrossCalorificValue"^^xsd:string
412 - ]
413 - ] ;
414 - sp:variable
415 - [ sp:varName "grossCalorificValueScale"^^xsd:string
416 - ]
417 - ])
418 ] . 418 ] .
419 419
420 <http://www.epim.no/schemas/mprml/1#DensityMeasure> 420 <http://www.epim.no/schemas/mprml/1#DensityMeasure>
...@@ -782,25 +782,98 @@ ...@@ -782,25 +782,98 @@
782 ]) 782 ])
783 ] . 783 ] .
784 784
785 +<http://www.epim.no/schemas/mprml/1#VolumeQualifiedMeasure>
786 + spin:rule
787 + [ rdf:type sp:Construct ;
788 + rdfs:comment "STEP 90070a Process volume for a quantity of material"^^xsd:string ;
789 + sp:templates ([ sp:object _:b17 ;
790 + sp:predicate rdf:type ;
791 + sp:subject
792 + [ sp:varName "quantityOfMaterial"^^xsd:string
793 + ]
794 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Volume> ;
795 + sp:predicate rdf:type ;
796 + sp:subject _:b17
797 + ] [ sp:object
798 + [ sp:varName "realVolume"^^xsd:string
799 + ] ;
800 + sp:predicate
801 + [ sp:varName "volumeScale"^^xsd:string
802 + ] ;
803 + sp:subject _:b17
804 + ]) ;
805 + sp:where ([ sp:object spin:_this ;
806 + sp:predicate <http://www.epim.no/schemas/mprml/1#volumeRef> ;
807 + sp:subject
808 + [ sp:varName "target"^^xsd:string
809 + ]
810 + ] [ sp:object
811 + [ sp:varName "target"^^xsd:string
812 + ] ;
813 + sp:predicate <http://www.reportinghub.no/ep/schema/core#derivedFrom> ;
814 + sp:subject
815 + [ sp:varName "quantityOfMaterial"^^xsd:string
816 + ]
817 + ] [ sp:object <http://www.reportinghub.no/ep/schema/material#QuantityOfMaterial> ;
818 + sp:predicate rdf:type ;
819 + sp:subject
820 + [ sp:varName "quantityOfMaterial"^^xsd:string
821 + ]
822 + ] [ rdf:type sp:NotExists ;
823 + sp:elements ([ sp:object
824 + [ sp:varName "target"^^xsd:string
825 + ] ;
826 + sp:predicate <http://www.reportinghub.no/ep/schema/core#derivedFrom> ;
827 + sp:subject
828 + [ sp:varName "classOfMaterialWithMassCriterion"^^xsd:string
829 + ]
830 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ClassOfMaterialWithMassCriterion> ;
831 + sp:predicate rdf:type ;
832 + sp:subject
833 + [ sp:varName "classOfMaterialWithMassCriterion"^^xsd:string
834 + ]
835 + ])
836 + ] [ sp:object
837 + [ sp:varName "realVolume"^^xsd:string
838 + ] ;
839 + sp:predicate <http://www.linkedmodel.org/schema/dtype#value> ;
840 + sp:subject spin:_this
841 + ] [ sp:object
842 + [ sp:varName "uomVolume"^^xsd:string
843 + ] ;
844 + sp:predicate <http://www.epim.no/schemas/mprml/1#uomRef> ;
845 + sp:subject spin:_this
846 + ] [ rdf:type sp:Bind ;
847 + sp:expression
848 + [ rdf:type ep-mpr-spin-lib:selectVolumeScale ;
849 + sp:arg1 [ sp:varName "uomVolume"^^xsd:string
850 + ]
851 + ] ;
852 + sp:variable
853 + [ sp:varName "volumeScale"^^xsd:string
854 + ]
855 + ])
856 + ] .
857 +
785 <http://www.epim.no/schemas/mprml/1#WorkMeasure> 858 <http://www.epim.no/schemas/mprml/1#WorkMeasure>
786 spin:rule 859 spin:rule
787 [ rdf:type sp:Construct ; 860 [ rdf:type sp:Construct ;
788 rdfs:comment "STEP 90030 Process work for a quantity of material"^^xsd:string ; 861 rdfs:comment "STEP 90030 Process work for a quantity of material"^^xsd:string ;
789 - sp:templates ([ sp:object _:b17 ; 862 + sp:templates ([ sp:object _:b18 ;
790 sp:predicate rdf:type ; 863 sp:predicate rdf:type ;
791 sp:subject 864 sp:subject
792 [ sp:varName "quantityOfMaterial"^^xsd:string 865 [ sp:varName "quantityOfMaterial"^^xsd:string
793 ] 866 ]
794 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Work> ; 867 ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Work> ;
795 sp:predicate rdf:type ; 868 sp:predicate rdf:type ;
796 - sp:subject _:b17 869 + sp:subject _:b18
797 ] [ sp:object 870 ] [ sp:object
798 [ sp:varName "realWork"^^xsd:string 871 [ sp:varName "realWork"^^xsd:string
799 ] ; 872 ] ;
800 sp:predicate 873 sp:predicate
801 [ sp:varName "workScale"^^xsd:string 874 [ sp:varName "workScale"^^xsd:string
802 ] ; 875 ] ;
803 - sp:subject _:b17 876 + sp:subject _:b18
804 ]) ; 877 ]) ;
805 sp:where ([ sp:object spin:_this ; 878 sp:where ([ sp:object spin:_this ;
806 sp:predicate <http://www.epim.no/schemas/mprml/1#workRef> ; 879 sp:predicate <http://www.epim.no/schemas/mprml/1#workRef> ;
...@@ -857,5 +930,5 @@ ...@@ -857,5 +930,5 @@
857 930
858 <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-commonPropertiesProductVolume-v1.1.1> 931 <http://www.reportinghub.no/ep/transform/TRANSFORM_mpr-commonPropertiesProductVolume-v1.1.1>
859 rdf:type owl:Ontology ; 932 rdf:type owl:Ontology ;
860 - owl:imports <http://spinrdf.org/spin> , <http://www.epim.no/schemas/mprml/1> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.reportinghub.no/ep/schema/1.0/material> , <http://www.reportinghub.no/ep/schema/1.0/flow> ; 933 + owl:imports <http://www.reportinghub.no/ep/schema/1.0/flow> , <http://www.reportinghub.no/ep/schema/1.0/material> , <http://www.reportinghub.no/ep/schema/1.0/core> , <http://www.epim.no/schemas/mprml/1> , <http://spinrdf.org/spin> ;
861 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 934 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
......