David Price

Improved Flow Densith

...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 19
20 <http://www.reportinghub.no/ep/spin/mpr-tables> 20 <http://www.reportinghub.no/ep/spin/mpr-tables>
21 rdf:type owl:Ontology ; 21 rdf:type owl:Ontology ;
22 - owl:imports <http://www.reportinghub.no/ep/transform/transform-helper-schema> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://spinrdf.org/spin> ; 22 + owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.reportinghub.no/ep/transform/transform-helper-schema> ;
23 owl:versionInfo "Created with TopBraid Composer"^^xsd:string . 23 owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
24 24
25 mpr-tables:ProductionFlows 25 mpr-tables:ProductionFlows
...@@ -730,7 +730,7 @@ mpr-tables:ProductionFlowsAll ...@@ -730,7 +730,7 @@ mpr-tables:ProductionFlowsAll
730 ] ; 730 ] ;
731 sp:predicate rdf:type ; 731 sp:predicate rdf:type ;
732 sp:subject 732 sp:subject
733 - [ sp:varName "productionFlowMixedPart"^^xsd:string 733 + [ sp:varName "productionFlowWhole"^^xsd:string
734 ] 734 ]
735 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ; 735 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowDefinitionType> ;
736 sp:predicate rdf:type ; 736 sp:predicate rdf:type ;
...@@ -778,9 +778,7 @@ mpr-tables:ProductionInventory ...@@ -778,9 +778,7 @@ mpr-tables:ProductionInventory
778 [ rdf:type sp:Select ; 778 [ rdf:type sp:Select ;
779 sp:resultVariables ([ sp:varName "wholeName"^^xsd:string 779 sp:resultVariables ([ sp:varName "wholeName"^^xsd:string
780 ] [ sp:varName "wholeTypeName"^^xsd:string 780 ] [ sp:varName "wholeTypeName"^^xsd:string
781 - ] [ sp:varName "materialQuantityName"^^xsd:string 781 + ] [ sp:varName "massValueString"^^xsd:string
782 - ] [ sp:varName "materialPropertyName"^^xsd:string
783 - ] [ sp:varName "materialValue"^^xsd:string
784 ]) ; 782 ]) ;
785 sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ; 783 sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ;
786 sp:predicate rdf:type ; 784 sp:predicate rdf:type ;
...@@ -818,6 +816,11 @@ mpr-tables:ProductionInventory ...@@ -818,6 +816,11 @@ mpr-tables:ProductionInventory
818 sp:subject 816 sp:subject
819 [ sp:varName "productionInventorysInPeriod"^^xsd:string 817 [ sp:varName "productionInventorysInPeriod"^^xsd:string
820 ] 818 ]
819 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionInventory> ;
820 + sp:predicate rdf:type ;
821 + sp:subject
822 + [ sp:varName "productionInventoryInPeriod"^^xsd:string
823 + ]
821 ] [ sp:object 824 ] [ sp:object
822 [ sp:varName "component"^^xsd:string 825 [ sp:varName "component"^^xsd:string
823 ] ; 826 ] ;
...@@ -838,7 +841,7 @@ mpr-tables:ProductionInventory ...@@ -838,7 +841,7 @@ mpr-tables:ProductionInventory
838 [ sp:varName "monthobject"^^xsd:string 841 [ sp:varName "monthobject"^^xsd:string
839 ] 842 ]
840 ] [ sp:object 843 ] [ sp:object
841 - [ sp:varName "mq"^^xsd:string 844 + [ sp:varName "materialInventory"^^xsd:string
842 ] ; 845 ] ;
843 sp:predicate <http://www.reportinghub.no/ep/schema/flow#materialInInventory> ; 846 sp:predicate <http://www.reportinghub.no/ep/schema/flow#materialInInventory> ;
844 sp:subject 847 sp:subject
...@@ -849,7 +852,12 @@ mpr-tables:ProductionInventory ...@@ -849,7 +852,12 @@ mpr-tables:ProductionInventory
849 ] ; 852 ] ;
850 sp:predicate rdf:type ; 853 sp:predicate rdf:type ;
851 sp:subject 854 sp:subject
852 - [ sp:varName "mq"^^xsd:string 855 + [ sp:varName "materialInventory"^^xsd:string
856 + ]
857 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Mass> ;
858 + sp:predicate rdf:type ;
859 + sp:subject
860 + [ sp:varName "materialQuantityValue"^^xsd:string
853 ] 861 ]
854 ] [ sp:object 862 ] [ sp:object
855 [ sp:varName "materialValue"^^xsd:string 863 [ sp:varName "materialValue"^^xsd:string
...@@ -884,12 +892,21 @@ mpr-tables:ProductionInventory ...@@ -884,12 +892,21 @@ mpr-tables:ProductionInventory
884 sp:subject 892 sp:subject
885 [ sp:varName "materialQuantity"^^xsd:string 893 [ sp:varName "materialQuantity"^^xsd:string
886 ] 894 ]
887 - ] [ sp:object 895 + ] [ rdf:type sp:Bind ;
888 - [ sp:varName "materialQuantityName"^^xsd:string 896 + sp:expression
897 + [ rdf:type fn:concat ;
898 + sp:arg1 [ rdf:type spif:decimalFormat ;
899 + arg:number
900 + [ sp:varName "materialValue"^^xsd:string
901 + ] ;
902 + arg:pattern "#.##"
903 + ] ;
904 + sp:arg2 " " ;
905 + sp:arg3 [ sp:varName "materialPropertyName"^^xsd:string
906 + ]
889 ] ; 907 ] ;
890 - sp:predicate rdfs:label ; 908 + sp:variable
891 - sp:subject 909 + [ sp:varName "massValueString"^^xsd:string
892 - [ sp:varName "materialQuantity"^^xsd:string
893 ] 910 ]
894 ] [ rdf:type sp:Optional ; 911 ] [ rdf:type sp:Optional ;
895 sp:elements ([ sp:object 912 sp:elements ([ sp:object
...@@ -952,9 +969,8 @@ mpr-tables:ProductionInventoryAll ...@@ -952,9 +969,8 @@ mpr-tables:ProductionInventoryAll
952 [ rdf:type sp:Select ; 969 [ rdf:type sp:Select ;
953 sp:resultVariables ([ sp:varName "wholeName"^^xsd:string 970 sp:resultVariables ([ sp:varName "wholeName"^^xsd:string
954 ] [ sp:varName "wholeTypeName"^^xsd:string 971 ] [ sp:varName "wholeTypeName"^^xsd:string
955 - ] [ sp:varName "materialQuantityName"^^xsd:string 972 + ] [ sp:varName "massValueString"^^xsd:string
956 - ] [ sp:varName "materialPropertyName"^^xsd:string 973 + ] [ sp:varName "densityValueString"^^xsd:string
957 - ] [ sp:varName "materialValue"^^xsd:string
958 ]) ; 974 ]) ;
959 sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ; 975 sp:where ([ sp:object <http://www.reportinghub.no/ep/schema/report#ProductionReport> ;
960 sp:predicate rdf:type ; 976 sp:predicate rdf:type ;
...@@ -1017,7 +1033,7 @@ mpr-tables:ProductionInventoryAll ...@@ -1017,7 +1033,7 @@ mpr-tables:ProductionInventoryAll
1017 [ sp:varName "monthobject"^^xsd:string 1033 [ sp:varName "monthobject"^^xsd:string
1018 ] 1034 ]
1019 ] [ sp:object 1035 ] [ sp:object
1020 - [ sp:varName "mq"^^xsd:string 1036 + [ sp:varName "materialInventory"^^xsd:string
1021 ] ; 1037 ] ;
1022 sp:predicate <http://www.reportinghub.no/ep/schema/flow#materialInInventory> ; 1038 sp:predicate <http://www.reportinghub.no/ep/schema/flow#materialInInventory> ;
1023 sp:subject 1039 sp:subject
...@@ -1028,7 +1044,12 @@ mpr-tables:ProductionInventoryAll ...@@ -1028,7 +1044,12 @@ mpr-tables:ProductionInventoryAll
1028 ] ; 1044 ] ;
1029 sp:predicate rdf:type ; 1045 sp:predicate rdf:type ;
1030 sp:subject 1046 sp:subject
1031 - [ sp:varName "mq"^^xsd:string 1047 + [ sp:varName "materialInventory"^^xsd:string
1048 + ]
1049 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Mass> ;
1050 + sp:predicate rdf:type ;
1051 + sp:subject
1052 + [ sp:varName "materialQuantityValue"^^xsd:string
1032 ] 1053 ]
1033 ] [ sp:object 1054 ] [ sp:object
1034 [ sp:varName "materialValue"^^xsd:string 1055 [ sp:varName "materialValue"^^xsd:string
...@@ -1063,15 +1084,82 @@ mpr-tables:ProductionInventoryAll ...@@ -1063,15 +1084,82 @@ mpr-tables:ProductionInventoryAll
1063 sp:subject 1084 sp:subject
1064 [ sp:varName "materialQuantity"^^xsd:string 1085 [ sp:varName "materialQuantity"^^xsd:string
1065 ] 1086 ]
1066 - ] [ sp:object 1087 + ] [ rdf:type sp:Bind ;
1067 - [ sp:varName "materialQuantityName"^^xsd:string 1088 + sp:expression
1089 + [ rdf:type fn:concat ;
1090 + sp:arg1 [ rdf:type spif:decimalFormat ;
1091 + arg:number
1092 + [ sp:varName "materialValue"^^xsd:string
1093 + ] ;
1094 + arg:pattern "#.##"
1095 + ] ;
1096 + sp:arg2 " " ;
1097 + sp:arg3 [ sp:varName "materialPropertyName"^^xsd:string
1098 + ]
1068 ] ; 1099 ] ;
1069 - sp:predicate rdfs:label ; 1100 + sp:variable
1070 - sp:subject 1101 + [ sp:varName "massValueString"^^xsd:string
1071 - [ sp:varName "materialQuantity"^^xsd:string
1072 ] 1102 ]
1073 ] [ rdf:type sp:Optional ; 1103 ] [ rdf:type sp:Optional ;
1074 sp:elements ([ sp:object 1104 sp:elements ([ sp:object
1105 + [ sp:varName "materialInventory"^^xsd:string
1106 + ] ;
1107 + sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
1108 + sp:subject
1109 + [ sp:varName "stateOfMaterialInventory"^^xsd:string
1110 + ]
1111 + ] [ sp:object
1112 + [ sp:varName "densityQuantityValue"^^xsd:string
1113 + ] ;
1114 + sp:predicate rdf:type ;
1115 + sp:subject
1116 + [ sp:varName "stateOfMaterialInventory"^^xsd:string
1117 + ]
1118 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Density> ;
1119 + sp:predicate rdf:type ;
1120 + sp:subject
1121 + [ sp:varName "densityQuantityValue"^^xsd:string
1122 + ]
1123 + ] [ sp:object
1124 + [ sp:varName "densityValue"^^xsd:string
1125 + ] ;
1126 + sp:predicate
1127 + [ sp:varName "densityPredicate"^^xsd:string
1128 + ] ;
1129 + sp:subject
1130 + [ sp:varName "densityQuantityValue"^^xsd:string
1131 + ]
1132 + ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Scale> ;
1133 + sp:predicate rdf:type ;
1134 + sp:subject
1135 + [ sp:varName "densityPredicate"^^xsd:string
1136 + ]
1137 + ] [ sp:object
1138 + [ sp:varName "densityUnit"^^xsd:string
1139 + ] ;
1140 + sp:predicate rdfs:label ;
1141 + sp:subject
1142 + [ sp:varName "densityPredicate"^^xsd:string
1143 + ]
1144 + ] [ rdf:type sp:Bind ;
1145 + sp:expression
1146 + [ rdf:type fn:concat ;
1147 + sp:arg1 [ rdf:type spif:decimalFormat ;
1148 + arg:number
1149 + [ sp:varName "densityValue"^^xsd:string
1150 + ] ;
1151 + arg:pattern "#.##"
1152 + ] ;
1153 + sp:arg2 " " ;
1154 + sp:arg3 [ sp:varName "densityUnit"^^xsd:string
1155 + ]
1156 + ] ;
1157 + sp:variable
1158 + [ sp:varName "densityValueString"^^xsd:string
1159 + ]
1160 + ])
1161 + ] [ rdf:type sp:Optional ;
1162 + sp:elements ([ sp:object
1075 [ sp:varName "piPart"^^xsd:string 1163 [ sp:varName "piPart"^^xsd:string
1076 ] ; 1164 ] ;
1077 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ; 1165 sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
...@@ -1121,4 +1209,4 @@ mpr-tables:ProductionInventoryAll ...@@ -1121,4 +1209,4 @@ mpr-tables:ProductionInventoryAll
1121 ]) 1209 ])
1122 ]) 1210 ])
1123 ] ; 1211 ] ;
1124 - rhspin:tableHeaders ("Material"^^xsd:string "Material Type"^^xsd:string "Quantity"^^xsd:string "Unit"^^xsd:string "Value"^^xsd:string) . 1212 + rhspin:tableHeaders ("Material"^^xsd:string "Material Type"^^xsd:string "Mass"^^xsd:string "Density"^^xsd:string) .
......