Elements related to last commit.

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/bundle.oml

@@ -9,8 +9,8 @@ description bundle <http://ua.com.be/sdo2l/description/bundle#> as ^bundle {
     includes <http://ua.com.be/sdo2l/description/drivetrain/ftg#>
     includes <http://ua.com.be/sdo2l/description/drivetrain/pm#>
     includes <http://ua.com.be/sdo2l/description/drivetrain/pt#>
-    includes <http://ua.com.be/sdo2l/description/drivetrain/artifacts#>
-    includes <http://ua.com.be/sdo2l/description/drivetrain/sensor#>
-    includes <http://ua.com.be/sdo2l/description/drivetrain/coupling#>
-    includes <http://ua.com.be/sdo2l/description/drivetrain/profile#>
+    includes <http://ua.com.be/sdo2l/description/drivetrain/artifacts/artifacts#>
+    includes <http://ua.com.be/sdo2l/description/drivetrain/artifacts/sensor#>
+    includes <http://ua.com.be/sdo2l/description/drivetrain/artifacts/coupling#>
+    includes <http://ua.com.be/sdo2l/description/drivetrain/artifacts/profile#>
 }

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/drivetrain/artifacts/artifacts.oml

@@ -1,4 +1,4 @@
-description <http://ua.com.be/sdo2l/description/drivetrain/artifacts#> as artifacts {
+description <http://ua.com.be/sdo2l/description/drivetrain/artifacts/artifacts#> as artifacts {
     uses <http://ua.com.be/sdo2l/vocabulary/processtraces#> as traces
     uses <http://ua.com.be/sdo2l/vocabulary/base/file#> as file
 	uses <http://ua.com.be/sdo2l/vocabulary/base/text#> as text
@@ -30,6 +30,11 @@ description <http://ua.com.be/sdo2l/description/drivetrain/artifacts#> as artifa
     ci test-requirements-line-2 : text:TextLine [text:isInTextFile test-requirements text:isOnLine 2 text:holdsTextData "This sensor needs to measure values."]
     ci test-requirements-line-3 : text:TextLine [text:isInTextFile test-requirements text:isOnLine 3 text:holdsTextData "These values need to be between certain limits."]
 
+	
+	ci torque-profile-v2 : tabular:TabularData [
+		traces:hasVersion "0.0.2"
+		file:isLocatedAt "src/main/resources/csv/profile.csv"
+	]
     // NOTE: Only 3 rows are modelled
 	ci torque-profile : tabular:TabularData [
 		traces:hasVersion "0.0.1"
@@ -166,6 +171,12 @@ description <http://ua.com.be/sdo2l/description/drivetrain/artifacts#> as artifa
     ci c-code-to-be-run-on-rtt-line-0 : text:TextLine [text:isInTextFile c-code-to-be-run-on-rtt text:isOnLine 0 text:holdsTextData "#include <stdio.h>"]
     ci c-code-to-be-run-on-rtt-line-1 : text:TextLine [text:isInTextFile c-code-to-be-run-on-rtt text:isOnLine 1 text:holdsTextData 'int main() {printf("Hello, World!"); return 0;}']
 
+
+	ci drivetrain-sensor-data-v2 : tabular:TabularData [
+		traces:hasVersion "0.0.2"
+		file:isLocatedAt "src/main/resources/csv/sensor.csv"
+	]
+
     // NOTE: Only 2 rows are modelled
 	ci drivetrain-sensor-data : tabular:TabularData [
 		traces:hasVersion "0.0.1"
@@ -439,6 +450,12 @@ description <http://ua.com.be/sdo2l/description/drivetrain/artifacts#> as artifa
         tabular:hasCell drivetrain-sensor-data-cell-09
         tabular:hasCell drivetrain-sensor-data-cell-19
     ]
+    
+    // NOTE: Only 2 rows are modelled
+	ci coupling-sensor-data-v2 : tabular:TabularData [
+		traces:hasVersion "0.0.2"
+       	file:isLocatedAt "src/main/resources/csv/coupling.csv"
+    ]
 
     // NOTE: Only 2 rows are modelled
 	ci coupling-sensor-data : tabular:TabularData [

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/drivetrain/artifacts/profile.oml

@@ -1,495 +1,512 @@
-description <http://ua.com.be/sdo2l/description/drivetrain/profile#> as csv {
-	uses <http://ua.com.be/sdo2l/vocabulary/processtraces#> as traces
-	uses <http://ua.com.be/sdo2l/vocabulary/base/file#> as file
+description <http://ua.com.be/sdo2l/description/drivetrain/artifacts/profile#> as csv {
 	uses <http://ua.com.be/sdo2l/vocabulary/base/tabular#> as tabular
+	extends <http://ua.com.be/sdo2l/description/drivetrain/artifacts/artifacts#> as art
 
-	ci torque-profile : tabular:TabularData [
-		traces:hasVersion "0.0.1"
-		file:isLocatedAt "src/main/resources/csv/profile.csv"
-		tabular:hasCells torque-profile-cell-00
-		tabular:hasCells torque-profile-cell-01
-		tabular:hasCells torque-profile-cell-10
-		tabular:hasCells torque-profile-cell-11
-		tabular:hasCells torque-profile-cell-20
-		tabular:hasCells torque-profile-cell-21
-		tabular:hasCells torque-profile-cell-30
-		tabular:hasCells torque-profile-cell-31
-		tabular:hasCells torque-profile-cell-40
-		tabular:hasCells torque-profile-cell-41
-		tabular:hasCells torque-profile-cell-50
-		tabular:hasCells torque-profile-cell-51
-		tabular:hasCells torque-profile-cell-60
-		tabular:hasCells torque-profile-cell-61
-		tabular:hasCells torque-profile-cell-70
-		tabular:hasCells torque-profile-cell-71
-		tabular:hasCells torque-profile-cell-80
-		tabular:hasCells torque-profile-cell-81
-		tabular:hasCells torque-profile-cell-90
-		tabular:hasCells torque-profile-cell-91
-		tabular:hasCells torque-profile-cell-100
-		tabular:hasCells torque-profile-cell-101
-		tabular:hasCells torque-profile-cell-110
-		tabular:hasCells torque-profile-cell-111
-		tabular:hasCells torque-profile-cell-120
-		tabular:hasCells torque-profile-cell-121
-		tabular:hasCells torque-profile-cell-130
-		tabular:hasCells torque-profile-cell-131
-		tabular:hasCells torque-profile-cell-140
-		tabular:hasCells torque-profile-cell-141
-		tabular:hasCells torque-profile-cell-150
-		tabular:hasCells torque-profile-cell-151
-		tabular:hasCells torque-profile-cell-160
-		tabular:hasCells torque-profile-cell-161
-		tabular:hasCells torque-profile-cell-170
-		tabular:hasCells torque-profile-cell-171
-		tabular:hasCells torque-profile-cell-180
-		tabular:hasCells torque-profile-cell-181
-		tabular:hasCells torque-profile-cell-190
-		tabular:hasCells torque-profile-cell-191
-		tabular:hasCells torque-profile-cell-200
-		tabular:hasCells torque-profile-cell-201
-		tabular:hasRows torque-profile-row-0
-		tabular:hasRows torque-profile-row-1
-		tabular:hasRows torque-profile-row-2
-		tabular:hasRows torque-profile-row-3
-		tabular:hasRows torque-profile-row-4
-		tabular:hasRows torque-profile-row-5
-		tabular:hasRows torque-profile-row-6
-		tabular:hasRows torque-profile-row-7
-		tabular:hasRows torque-profile-row-8
-		tabular:hasRows torque-profile-row-9
-		tabular:hasRows torque-profile-row-10
-		tabular:hasRows torque-profile-row-11
-		tabular:hasRows torque-profile-row-12
-		tabular:hasRows torque-profile-row-13
-		tabular:hasRows torque-profile-row-14
-		tabular:hasRows torque-profile-row-15
-		tabular:hasRows torque-profile-row-16
-		tabular:hasRows torque-profile-row-17
-		tabular:hasRows torque-profile-row-18
-		tabular:hasRows torque-profile-row-19
-		tabular:hasRows torque-profile-row-20
+	ref ci art:torque-profile-v2 : tabular:TabularData [
+		tabular:hasCells torque-profile-v2-cell-00
+		tabular:hasCells torque-profile-v2-cell-01
+		tabular:hasCells torque-profile-v2-cell-10
+		tabular:hasCells torque-profile-v2-cell-11
+		tabular:hasCells torque-profile-v2-cell-20
+		tabular:hasCells torque-profile-v2-cell-21
+		tabular:hasCells torque-profile-v2-cell-30
+		tabular:hasCells torque-profile-v2-cell-31
+		tabular:hasCells torque-profile-v2-cell-40
+		tabular:hasCells torque-profile-v2-cell-41
+		tabular:hasCells torque-profile-v2-cell-50
+		tabular:hasCells torque-profile-v2-cell-51
+		tabular:hasCells torque-profile-v2-cell-60
+		tabular:hasCells torque-profile-v2-cell-61
+		tabular:hasCells torque-profile-v2-cell-70
+		tabular:hasCells torque-profile-v2-cell-71
+		tabular:hasCells torque-profile-v2-cell-80
+		tabular:hasCells torque-profile-v2-cell-81
+		tabular:hasCells torque-profile-v2-cell-90
+		tabular:hasCells torque-profile-v2-cell-91
+		tabular:hasCells torque-profile-v2-cell-100
+		tabular:hasCells torque-profile-v2-cell-101
+		tabular:hasCells torque-profile-v2-cell-110
+		tabular:hasCells torque-profile-v2-cell-111
+		tabular:hasCells torque-profile-v2-cell-120
+		tabular:hasCells torque-profile-v2-cell-121
+		tabular:hasCells torque-profile-v2-cell-130
+		tabular:hasCells torque-profile-v2-cell-131
+		tabular:hasCells torque-profile-v2-cell-140
+		tabular:hasCells torque-profile-v2-cell-141
+		tabular:hasCells torque-profile-v2-cell-150
+		tabular:hasCells torque-profile-v2-cell-151
+		tabular:hasCells torque-profile-v2-cell-160
+		tabular:hasCells torque-profile-v2-cell-161
+		tabular:hasCells torque-profile-v2-cell-170
+		tabular:hasCells torque-profile-v2-cell-171
+		tabular:hasCells torque-profile-v2-cell-180
+		tabular:hasCells torque-profile-v2-cell-181
+		tabular:hasCells torque-profile-v2-cell-190
+		tabular:hasCells torque-profile-v2-cell-191
+		tabular:hasCells torque-profile-v2-cell-200
+		tabular:hasCells torque-profile-v2-cell-201
+		tabular:hasRows torque-profile-v2-row-0
+		tabular:hasRows torque-profile-v2-row-1
+		tabular:hasRows torque-profile-v2-row-2
+		tabular:hasRows torque-profile-v2-row-3
+		tabular:hasRows torque-profile-v2-row-4
+		tabular:hasRows torque-profile-v2-row-5
+		tabular:hasRows torque-profile-v2-row-6
+		tabular:hasRows torque-profile-v2-row-7
+		tabular:hasRows torque-profile-v2-row-8
+		tabular:hasRows torque-profile-v2-row-9
+		tabular:hasRows torque-profile-v2-row-10
+		tabular:hasRows torque-profile-v2-row-11
+		tabular:hasRows torque-profile-v2-row-12
+		tabular:hasRows torque-profile-v2-row-13
+		tabular:hasRows torque-profile-v2-row-14
+		tabular:hasRows torque-profile-v2-row-15
+		tabular:hasRows torque-profile-v2-row-16
+		tabular:hasRows torque-profile-v2-row-17
+		tabular:hasRows torque-profile-v2-row-18
+		tabular:hasRows torque-profile-v2-row-19
+		tabular:hasRows torque-profile-v2-row-20
 	]
 
-	ci torque-profile-row-0 : tabular:HeaderRow [
+	ci torque-profile-v2-row-0 : tabular:HeaderRow [
 		tabular:hasRowId 0
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-00
-		tabular:hasCell torque-profile-cell-01
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-00
+		tabular:hasCell torque-profile-v2-cell-01
 	]
-	ci torque-profile-row-1 : tabular:Row [
+	ci torque-profile-v2-row-1 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 1
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-10
-		tabular:hasCell torque-profile-cell-11
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-10
+		tabular:hasCell torque-profile-v2-cell-11
 	]
-	ci torque-profile-row-2 : tabular:Row [
+	ci torque-profile-v2-row-2 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 2
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-20
-		tabular:hasCell torque-profile-cell-21
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-20
+		tabular:hasCell torque-profile-v2-cell-21
 	]
-	ci torque-profile-row-3 : tabular:Row [
+	ci torque-profile-v2-row-3 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 3
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-30
-		tabular:hasCell torque-profile-cell-31
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-30
+		tabular:hasCell torque-profile-v2-cell-31
 	]
-	ci torque-profile-row-4 : tabular:Row [
+	ci torque-profile-v2-row-4 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 4
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-40
-		tabular:hasCell torque-profile-cell-41
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-40
+		tabular:hasCell torque-profile-v2-cell-41
 	]
-	ci torque-profile-row-5 : tabular:Row [
+	ci torque-profile-v2-row-5 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 5
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-50
-		tabular:hasCell torque-profile-cell-51
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-50
+		tabular:hasCell torque-profile-v2-cell-51
 	]
-	ci torque-profile-row-6 : tabular:Row [
+	ci torque-profile-v2-row-6 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 6
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-60
-		tabular:hasCell torque-profile-cell-61
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-60
+		tabular:hasCell torque-profile-v2-cell-61
 	]
-	ci torque-profile-row-7 : tabular:Row [
+	ci torque-profile-v2-row-7 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 7
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-70
-		tabular:hasCell torque-profile-cell-71
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-70
+		tabular:hasCell torque-profile-v2-cell-71
 	]
-	ci torque-profile-row-8 : tabular:Row [
+	ci torque-profile-v2-row-8 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 8
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-80
-		tabular:hasCell torque-profile-cell-81
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-80
+		tabular:hasCell torque-profile-v2-cell-81
 	]
-	ci torque-profile-row-9 : tabular:Row [
+	ci torque-profile-v2-row-9 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 9
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-90
-		tabular:hasCell torque-profile-cell-91
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-90
+		tabular:hasCell torque-profile-v2-cell-91
 	]
-	ci torque-profile-row-10 : tabular:Row [
+	ci torque-profile-v2-row-10 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 10
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-100
-		tabular:hasCell torque-profile-cell-101
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-100
+		tabular:hasCell torque-profile-v2-cell-101
 	]
-	ci torque-profile-row-11 : tabular:Row [
+	ci torque-profile-v2-row-11 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 11
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-110
-		tabular:hasCell torque-profile-cell-111
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-110
+		tabular:hasCell torque-profile-v2-cell-111
 	]
-	ci torque-profile-row-12 : tabular:Row [
+	ci torque-profile-v2-row-12 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 12
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-120
-		tabular:hasCell torque-profile-cell-121
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-120
+		tabular:hasCell torque-profile-v2-cell-121
 	]
-	ci torque-profile-row-13 : tabular:Row [
+	ci torque-profile-v2-row-13 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 13
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-130
-		tabular:hasCell torque-profile-cell-131
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-130
+		tabular:hasCell torque-profile-v2-cell-131
 	]
-	ci torque-profile-row-14 : tabular:Row [
+	ci torque-profile-v2-row-14 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 14
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-140
-		tabular:hasCell torque-profile-cell-141
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-140
+		tabular:hasCell torque-profile-v2-cell-141
 	]
-	ci torque-profile-row-15 : tabular:Row [
+	ci torque-profile-v2-row-15 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 15
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-150
-		tabular:hasCell torque-profile-cell-151
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-150
+		tabular:hasCell torque-profile-v2-cell-151
 	]
-	ci torque-profile-row-16 : tabular:Row [
+	ci torque-profile-v2-row-16 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 16
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-160
-		tabular:hasCell torque-profile-cell-161
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-160
+		tabular:hasCell torque-profile-v2-cell-161
 	]
-	ci torque-profile-row-17 : tabular:Row [
+	ci torque-profile-v2-row-17 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 17
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-170
-		tabular:hasCell torque-profile-cell-171
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-170
+		tabular:hasCell torque-profile-v2-cell-171
 	]
-	ci torque-profile-row-18 : tabular:Row [
+	ci torque-profile-v2-row-18 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 18
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-180
-		tabular:hasCell torque-profile-cell-181
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-180
+		tabular:hasCell torque-profile-v2-cell-181
 	]
-	ci torque-profile-row-19 : tabular:Row [
+	ci torque-profile-v2-row-19 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 19
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-190
-		tabular:hasCell torque-profile-cell-191
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-190
+		tabular:hasCell torque-profile-v2-cell-191
 	]
-	ci torque-profile-row-20 : tabular:Row [
+	ci torque-profile-v2-row-20 : tabular:Row [
+		tabular:hasHeadingModifier "no"
 		tabular:hasRowId 20
-		tabular:isRowOfTabularData torque-profile
-		tabular:hasCell torque-profile-cell-200
-		tabular:hasCell torque-profile-cell-201
+		tabular:isRowOfTabularData art:torque-profile-v2
+		tabular:hasCell torque-profile-v2-cell-200
+		tabular:hasCell torque-profile-v2-cell-201
 	]
-	ci torque-profile-cell-00 : tabular:Cell [
+	ci torque-profile-v2-cell-00 : tabular:Cell [
 		tabular:hasRowPosition 0
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "time"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-0
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-0
 	]
-	ci torque-profile-cell-01 : tabular:Cell [
+	ci torque-profile-v2-cell-01 : tabular:Cell [
 		tabular:hasRowPosition 0
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "value"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-0
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-0
 	]
-	ci torque-profile-cell-10 : tabular:Cell [
+	ci torque-profile-v2-cell-10 : tabular:Cell [
 		tabular:hasRowPosition 1
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1645343060000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-1
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-1
 	]
-	ci torque-profile-cell-11 : tabular:Cell [
+	ci torque-profile-v2-cell-11 : tabular:Cell [
 		tabular:hasRowPosition 1
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "0.1063435735"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-1
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-1
 	]
-	ci torque-profile-cell-20 : tabular:Cell [
+	ci torque-profile-v2-cell-20 : tabular:Cell [
 		tabular:hasRowPosition 2
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1645799771000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-2
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-2
 	]
-	ci torque-profile-cell-21 : tabular:Cell [
+	ci torque-profile-v2-cell-21 : tabular:Cell [
 		tabular:hasRowPosition 2
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "0.1413462533"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-2
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-2
 	]
-	ci torque-profile-cell-30 : tabular:Cell [
+	ci torque-profile-v2-cell-30 : tabular:Cell [
 		tabular:hasRowPosition 3
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1643731574000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-3
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-3
 	]
-	ci torque-profile-cell-31 : tabular:Cell [
+	ci torque-profile-v2-cell-31 : tabular:Cell [
 		tabular:hasRowPosition 3
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "0.0373289706"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-3
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-3
 	]
-	ci torque-profile-cell-40 : tabular:Cell [
+	ci torque-profile-v2-cell-40 : tabular:Cell [
 		tabular:hasRowPosition 4
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1645534917000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-4
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-4
 	]
-	ci torque-profile-cell-41 : tabular:Cell [
+	ci torque-profile-v2-cell-41 : tabular:Cell [
 		tabular:hasRowPosition 4
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "0.1933671917"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-4
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-4
 	]
-	ci torque-profile-cell-50 : tabular:Cell [
+	ci torque-profile-v2-cell-50 : tabular:Cell [
 		tabular:hasRowPosition 5
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1645881479000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-5
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-5
 	]
-	ci torque-profile-cell-51 : tabular:Cell [
+	ci torque-profile-v2-cell-51 : tabular:Cell [
 		tabular:hasRowPosition 5
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "-0.1221919282"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-5
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-5
 	]
-	ci torque-profile-cell-60 : tabular:Cell [
+	ci torque-profile-v2-cell-60 : tabular:Cell [
 		tabular:hasRowPosition 6
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1644552154000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-6
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-6
 	]
-	ci torque-profile-cell-61 : tabular:Cell [
+	ci torque-profile-v2-cell-61 : tabular:Cell [
 		tabular:hasRowPosition 6
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "-0.1778075408"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-6
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-6
 	]
-	ci torque-profile-cell-70 : tabular:Cell [
+	ci torque-profile-v2-cell-70 : tabular:Cell [
 		tabular:hasRowPosition 7
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1644171052000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-7
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-7
 	]
-	ci torque-profile-cell-71 : tabular:Cell [
+	ci torque-profile-v2-cell-71 : tabular:Cell [
 		tabular:hasRowPosition 7
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "-0.2688664202"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-7
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-7
 	]
-	ci torque-profile-cell-80 : tabular:Cell [
+	ci torque-profile-v2-cell-80 : tabular:Cell [
 		tabular:hasRowPosition 8
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1643827663000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-8
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-8
 	]
-	ci torque-profile-cell-81 : tabular:Cell [
+	ci torque-profile-v2-cell-81 : tabular:Cell [
 		tabular:hasRowPosition 8
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "-0.1011829049"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-8
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-8
 	]
-	ci torque-profile-cell-90 : tabular:Cell [
+	ci torque-profile-v2-cell-90 : tabular:Cell [
 		tabular:hasRowPosition 9
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1645673633000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-9
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-9
 	]
-	ci torque-profile-cell-91 : tabular:Cell [
+	ci torque-profile-v2-cell-91 : tabular:Cell [
 		tabular:hasRowPosition 9
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "-0.0463323214"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-9
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-9
 	]
-	ci torque-profile-cell-100 : tabular:Cell [
+	ci torque-profile-v2-cell-100 : tabular:Cell [
 		tabular:hasRowPosition 10
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1645119377000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-10
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-10
 	]
-	ci torque-profile-cell-101 : tabular:Cell [
+	ci torque-profile-v2-cell-101 : tabular:Cell [
 		tabular:hasRowPosition 10
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "-0.2162654668"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-10
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-10
 	]
-	ci torque-profile-cell-110 : tabular:Cell [
+	ci torque-profile-v2-cell-110 : tabular:Cell [
 		tabular:hasRowPosition 11
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1644038701000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-11
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-11
 	]
-	ci torque-profile-cell-111 : tabular:Cell [
+	ci torque-profile-v2-cell-111 : tabular:Cell [
 		tabular:hasRowPosition 11
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "0.2680340619"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-11
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-11
 	]
-	ci torque-profile-cell-120 : tabular:Cell [
+	ci torque-profile-v2-cell-120 : tabular:Cell [
 		tabular:hasRowPosition 12
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1645058918000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-12
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-12
 	]
-	ci torque-profile-cell-121 : tabular:Cell [
+	ci torque-profile-v2-cell-121 : tabular:Cell [
 		tabular:hasRowPosition 12
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "-0.0288904173"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-12
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-12
 	]
-	ci torque-profile-cell-130 : tabular:Cell [
+	ci torque-profile-v2-cell-130 : tabular:Cell [
 		tabular:hasRowPosition 13
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1643880041000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-13
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-13
 	]
-	ci torque-profile-cell-131 : tabular:Cell [
+	ci torque-profile-v2-cell-131 : tabular:Cell [
 		tabular:hasRowPosition 13
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "0.0804983286"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-13
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-13
 	]
-	ci torque-profile-cell-140 : tabular:Cell [
+	ci torque-profile-v2-cell-140 : tabular:Cell [
 		tabular:hasRowPosition 14
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1645744877000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-14
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-14
 	]
-	ci torque-profile-cell-141 : tabular:Cell [
+	ci torque-profile-v2-cell-141 : tabular:Cell [
 		tabular:hasRowPosition 14
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "0.0828198062"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-14
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-14
 	]
-	ci torque-profile-cell-150 : tabular:Cell [
+	ci torque-profile-v2-cell-150 : tabular:Cell [
 		tabular:hasRowPosition 15
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1645403668000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-15
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-15
 	]
-	ci torque-profile-cell-151 : tabular:Cell [
+	ci torque-profile-v2-cell-151 : tabular:Cell [
 		tabular:hasRowPosition 15
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "0.2368045351"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-15
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-15
 	]
-	ci torque-profile-cell-160 : tabular:Cell [
+	ci torque-profile-v2-cell-160 : tabular:Cell [
 		tabular:hasRowPosition 16
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1645322842000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-16
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-16
 	]
-	ci torque-profile-cell-161 : tabular:Cell [
+	ci torque-profile-v2-cell-161 : tabular:Cell [
 		tabular:hasRowPosition 16
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "-0.3658627047"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-16
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-16
 	]
-	ci torque-profile-cell-170 : tabular:Cell [
+	ci torque-profile-v2-cell-170 : tabular:Cell [
 		tabular:hasRowPosition 17
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1645305624000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-17
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-17
 	]
-	ci torque-profile-cell-171 : tabular:Cell [
+	ci torque-profile-v2-cell-171 : tabular:Cell [
 		tabular:hasRowPosition 17
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "-0.2719289020"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-17
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-17
 	]
-	ci torque-profile-cell-180 : tabular:Cell [
+	ci torque-profile-v2-cell-180 : tabular:Cell [
 		tabular:hasRowPosition 18
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1645430775000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-18
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-18
 	]
-	ci torque-profile-cell-181 : tabular:Cell [
+	ci torque-profile-v2-cell-181 : tabular:Cell [
 		tabular:hasRowPosition 18
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "-0.1403125402"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-18
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-18
 	]
-	ci torque-profile-cell-190 : tabular:Cell [
+	ci torque-profile-v2-cell-190 : tabular:Cell [
 		tabular:hasRowPosition 19
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1644767653000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-19
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-19
 	]
-	ci torque-profile-cell-191 : tabular:Cell [
+	ci torque-profile-v2-cell-191 : tabular:Cell [
 		tabular:hasRowPosition 19
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "-0.1142019323"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-19
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-19
 	]
-	ci torque-profile-cell-200 : tabular:Cell [
+	ci torque-profile-v2-cell-200 : tabular:Cell [
 		tabular:hasRowPosition 20
 		tabular:hasColumnPosition 0
 		tabular:holdsContent "1644604915000"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-20
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-20
 	]
-	ci torque-profile-cell-201 : tabular:Cell [
+	ci torque-profile-v2-cell-201 : tabular:Cell [
 		tabular:hasRowPosition 20
 		tabular:hasColumnPosition 1
 		tabular:holdsContent "-0.0052879950"
-		tabular:isCellOfTabularData torque-profile
-		tabular:isInCollection torque-profile-row-20
+		tabular:isCellOfTabularData art:torque-profile-v2
+		tabular:isInCollection torque-profile-v2-row-20
 	]
 
 }

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/drivetrain/pt.oml

@@ -2,7 +2,7 @@ description <http://ua.com.be/sdo2l/description/drivetrain/pt#> as pt {
 	uses <http://ua.com.be/sdo2l/vocabulary/processtraces#> as traces
 	uses <http://ua.com.be/sdo2l/vocabulary/base#> as base
 	extends <http://ua.com.be/sdo2l/description/drivetrain/pm#> as wf
-	extends <http://ua.com.be/sdo2l/description/drivetrain/artifacts#> as art
+	extends <http://ua.com.be/sdo2l/description/drivetrain/artifacts/artifacts#> as art
 
 	// Traces
 

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/vocabulary/base/code.oml

@@ -1,9 +1,5 @@
 vocabulary <http://ua.com.be/sdo2l/vocabulary/base/code#> as code {
-    extends <http://www.w3.org/2001/XMLSchema#> as xsd
-    extends <http://purl.org/dc/elements/1.1/> as dc
-    extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
-
-    extends <http://ua.com.be/sdo2l/vocabulary/base/text#> as text
+	extends <http://ua.com.be/sdo2l/vocabulary/base/text#> as text
 
 
     concept CodeData :> text:TextData

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/vocabulary/base/file.oml

@@ -1,7 +1,5 @@
 vocabulary <http://ua.com.be/sdo2l/vocabulary/base/file#> as file {
     extends <http://www.w3.org/2001/XMLSchema#> as xsd
-    extends <http://purl.org/dc/elements/1.1/> as dc
-    extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
     extends <http://ua.com.be/sdo2l/vocabulary/processtraces#> as traces
 
     aspect Data

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/vocabulary/base/ftg.oml

@@ -1,6 +1,5 @@
 vocabulary <http://ua.com.be/sdo2l/vocabulary/base/ftg#> as ftg {
     extends <http://www.w3.org/2001/XMLSchema#> as xsd
-    extends <http://purl.org/dc/elements/1.1/> as dc
     extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
 
     @rdfs:comment ""

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/vocabulary/base/richtext.oml

@@ -1,7 +1,5 @@
 vocabulary <http://ua.com.be/sdo2l/vocabulary/base/richtext#> as richtext {
     extends <http://www.w3.org/2001/XMLSchema#> as xsd
-    extends <http://purl.org/dc/elements/1.1/> as dc
-    extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
 
     extends <http://ua.com.be/sdo2l/vocabulary/base/text#> as text
 

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/vocabulary/base/script.oml

@@ -1,7 +1,5 @@
 vocabulary <http://ua.com.be/sdo2l/vocabulary/base/script#> as script {
     extends <http://www.w3.org/2001/XMLSchema#> as xsd
-    extends <http://purl.org/dc/elements/1.1/> as dc
-    extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
     extends <http://ua.com.be/sdo2l/vocabulary/base/code#> as code
     extends <http://ua.com.be/sdo2l/vocabulary/base/file#> as file
 

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/vocabulary/base/tabular.oml

@@ -1,7 +1,5 @@
 vocabulary <http://ua.com.be/sdo2l/vocabulary/base/tabular#> as tabular {
     extends <http://www.w3.org/2001/XMLSchema#> as xsd
-    extends <http://purl.org/dc/elements/1.1/> as dc
-    extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
     extends <http://ua.com.be/sdo2l/vocabulary/base/file#> as file
 
     aspect Collection

examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/vocabulary/base/text.oml

@@ -1,7 +1,5 @@
 vocabulary <http://ua.com.be/sdo2l/vocabulary/base/text#> as text {
     extends <http://www.w3.org/2001/XMLSchema#> as xsd
-    extends <http://purl.org/dc/elements/1.1/> as dc
-    extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
 
     extends <http://ua.com.be/sdo2l/vocabulary/base/file#> as file
 

examples/oml/SystemDesignOntology2Layers/src/sparql/query.ttl

@@ -15,18 +15,18 @@ WHERE {
     FILTER regex(?attID, "w[0-9]-mass") .
 	?attribute vim4:hasDoubleNumber ?attMass .
 	{
-	SELECT ?car2 (avg(?attMass2) as ?avg)
+	SELECT ?car (avg(?attMass2) as ?avg)
 	WHERE {
-		?car2 rdf:type comp:CarComponent .
+		?car rdf:type comp:CarComponent .
 		?wheel2 rdf:type comp:WheelComponent .
-		?car2 base:contains ?wheel2 .
+		?car base:contains ?wheel2 .
 		?attribute2 rdf:type comp:Attribute .
 		?attribute2 vim4:characterizes ?wheel2 .
 		?attribute2 base:hasIdentifier ?attID2 .
     	FILTER regex(?attID2, "w[0-9]-mass") .
 		?attribute2 vim4:hasDoubleNumber ?attMass2 .
 	}
-	GROUP BY ?car2
+	GROUP BY ?car
 	}
 }
 HAVING (abs(?attMass-?avg) >= (?avg*0.05) )