Added mole ratio figures to Fluid Sample Analysis Results section of report.
Showing
1 changed file
with
56 additions
and
16 deletions
| ... | @@ -252,6 +252,7 @@ dpr-tables:FluidSampleAnalysisResults | ... | @@ -252,6 +252,7 @@ dpr-tables:FluidSampleAnalysisResults |
| 252 | rdfs:subClassOf rhspin:DPRTableTemplates ; | 252 | rdfs:subClassOf rhspin:DPRTableTemplates ; |
| 253 | spin:body | 253 | spin:body |
| 254 | [ rdf:type sp:Select ; | 254 | [ rdf:type sp:Select ; |
| 255 | + sp:distinct "true"^^xsd:boolean ; | ||
| 255 | sp:orderBy ([ sp:varName "sampledFluidName"^^xsd:string | 256 | sp:orderBy ([ sp:varName "sampledFluidName"^^xsd:string |
| 256 | ]) ; | 257 | ]) ; |
| 257 | sp:resultVariables ([ sp:varName "sampledFluidName"^^xsd:string | 258 | sp:resultVariables ([ sp:varName "sampledFluidName"^^xsd:string |
| ... | @@ -347,48 +348,87 @@ dpr-tables:FluidSampleAnalysisResults | ... | @@ -347,48 +348,87 @@ dpr-tables:FluidSampleAnalysisResults |
| 347 | sp:subject | 348 | sp:subject |
| 348 | [ sp:varName "componentType"^^xsd:string | 349 | [ sp:varName "componentType"^^xsd:string |
| 349 | ] | 350 | ] |
| 350 | - ] [ rdf:type sp:Optional ; | 351 | + ] [ sp:object |
| 351 | - sp:elements ([ sp:object | 352 | + [ sp:varName "firstOfPair"^^xsd:string |
| 353 | + ] ; | ||
| 354 | + sp:predicate rdf:type ; | ||
| 355 | + sp:subject | ||
| 352 | [ sp:varName "component"^^xsd:string | 356 | [ sp:varName "component"^^xsd:string |
| 357 | + ] | ||
| 358 | + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#MolePair> ; | ||
| 359 | + sp:predicate rdf:type ; | ||
| 360 | + sp:subject | ||
| 361 | + [ sp:varName "molePair"^^xsd:string | ||
| 362 | + ] | ||
| 363 | + ] [ sp:object | ||
| 364 | + [ sp:varName "firstOfPair"^^xsd:string | ||
| 353 | ] ; | 365 | ] ; |
| 354 | - sp:predicate <http://www.reportinghub.no/ep/schema/material#partMaterialOfPair> ; | 366 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#firstOfPair> ; |
| 355 | sp:subject | 367 | sp:subject |
| 356 | - [ sp:varName "materialPair"^^xsd:string | 368 | + [ sp:varName "molePair"^^xsd:string |
| 357 | ] | 369 | ] |
| 358 | - ] [ rdf:type sp:Optional ; | 370 | + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Mole> ; |
| 359 | - sp:elements ([ sp:object | 371 | + sp:predicate rdf:type ; |
| 360 | - [ sp:varName "massRatio"^^xsd:string | 372 | + sp:subject |
| 373 | + [ sp:varName "firstOfPair"^^xsd:string | ||
| 374 | + ] | ||
| 375 | + ] [ sp:object | ||
| 376 | + [ sp:varName "secondOfPair"^^xsd:string | ||
| 361 | ] ; | 377 | ] ; |
| 362 | - sp:predicate <http://www.reportinghub.no/ep/schema/material#massRatio> ; | 378 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#secondOfPair> ; |
| 363 | sp:subject | 379 | sp:subject |
| 364 | - [ sp:varName "materialPair"^^xsd:string | 380 | + [ sp:varName "molePair"^^xsd:string |
| 381 | + ] | ||
| 382 | + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Mole> ; | ||
| 383 | + sp:predicate rdf:type ; | ||
| 384 | + sp:subject | ||
| 385 | + [ sp:varName "secondOfPair"^^xsd:string | ||
| 386 | + ] | ||
| 387 | + ] [ sp:object | ||
| 388 | + [ sp:varName "ratio"^^xsd:string | ||
| 389 | + ] ; | ||
| 390 | + sp:predicate <http://www.reportinghub.no/ep/schema/core#divide> ; | ||
| 391 | + sp:subject | ||
| 392 | + [ sp:varName "molePair"^^xsd:string | ||
| 393 | + ] | ||
| 394 | + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Ratio> ; | ||
| 395 | + sp:predicate rdf:type ; | ||
| 396 | + sp:subject | ||
| 397 | + [ sp:varName "ratio"^^xsd:string | ||
| 365 | ] | 398 | ] |
| 366 | ] [ rdf:type sp:Bind ; | 399 | ] [ rdf:type sp:Bind ; |
| 367 | sp:expression | 400 | sp:expression |
| 368 | [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ; | 401 | [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ; |
| 369 | - sp:arg1 [ sp:varName "massRatio"^^xsd:string | 402 | + sp:arg1 [ sp:varName "ratio"^^xsd:string |
| 370 | ] | 403 | ] |
| 371 | ] ; | 404 | ] ; |
| 372 | sp:variable | 405 | sp:variable |
| 373 | - [ sp:varName "massRatioPercent"^^xsd:string | 406 | + [ sp:varName "moleRatioPercent"^^xsd:string |
| 374 | ] | 407 | ] |
| 375 | - ]) | ||
| 376 | ] [ rdf:type sp:Optional ; | 408 | ] [ rdf:type sp:Optional ; |
| 377 | sp:elements ([ sp:object | 409 | sp:elements ([ sp:object |
| 378 | - [ sp:varName "moleRatio"^^xsd:string | 410 | + [ sp:varName "component"^^xsd:string |
| 379 | ] ; | 411 | ] ; |
| 380 | - sp:predicate <http://www.reportinghub.no/ep/schema/material#moleRatio> ; | 412 | + sp:predicate <http://www.reportinghub.no/ep/schema/material#partMaterialOfPair> ; |
| 413 | + sp:subject | ||
| 414 | + [ sp:varName "materialPair"^^xsd:string | ||
| 415 | + ] | ||
| 416 | + ] [ rdf:type sp:Optional ; | ||
| 417 | + sp:elements ([ sp:object | ||
| 418 | + [ sp:varName "massRatio"^^xsd:string | ||
| 419 | + ] ; | ||
| 420 | + sp:predicate <http://www.reportinghub.no/ep/schema/material#massRatio> ; | ||
| 381 | sp:subject | 421 | sp:subject |
| 382 | [ sp:varName "materialPair"^^xsd:string | 422 | [ sp:varName "materialPair"^^xsd:string |
| 383 | ] | 423 | ] |
| 384 | ] [ rdf:type sp:Bind ; | 424 | ] [ rdf:type sp:Bind ; |
| 385 | sp:expression | 425 | sp:expression |
| 386 | [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ; | 426 | [ rdf:type ep-spin-lib:normalizePropertyUnitAndValue ; |
| 387 | - sp:arg1 [ sp:varName "moleRatio"^^xsd:string | 427 | + sp:arg1 [ sp:varName "massRatio"^^xsd:string |
| 388 | ] | 428 | ] |
| 389 | ] ; | 429 | ] ; |
| 390 | sp:variable | 430 | sp:variable |
| 391 | - [ sp:varName "moleRatioPercent"^^xsd:string | 431 | + [ sp:varName "massRatioPercent"^^xsd:string |
| 392 | ] | 432 | ] |
| 393 | ]) | 433 | ]) |
| 394 | ]) | 434 | ]) | ... | ... |
-
Please register or login to post a comment