Fix base vocabulary

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

@@ -27,19 +27,37 @@ vocabulary <http://ua.com.be/sdo2l/vocabulary/base/code#> as code {
         forward usesCodeLanguage
     ]
 
-    concept CCode :> CodeLanguage [
+    concept CCodeLanguage :> CodeLanguage [
         restricts scalar property hasCodeLanguageOption to "C"
     ]
 
-    concept CppCode :> CodeLanguage [
+    concept CCode :> CodeData [
+        restricts all relation usesCodeLanguage to CCodeLanguage
+    ]
+
+    concept CppCodeLanguage :> CodeLanguage [
         restricts scalar property hasCodeLanguageOption to "C++"
     ]
 
-    concept PythonCode :> CodeLanguage [
+    concept CppCode :> CodeData [
+        restricts all relation usesCodeLanguage to CppCodeLanguage
+    ]
+
+    concept PythonCodeLanguage :> CodeLanguage [
         restricts scalar property hasCodeLanguageOption to "Python"
     ]
 
-    concept MATLABCode :> CodeLanguage [
+    concept PythonCode :> CodeData [
+        restricts all relation usesCodeLanguage to PythonCodeLanguage
+    ]
+
+    concept MATLABCodeLanguage :> CodeLanguage [
         restricts scalar property hasCodeLanguageOption to "MATLAB"
     ]
+
+    concept MATLABCode :> CodeData [
+        restricts all relation usesCodeLanguage to MATLABCodeLanguage
+    ]
+
+
 }

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

@@ -2,7 +2,6 @@ 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
 
@@ -17,7 +16,7 @@ vocabulary <http://ua.com.be/sdo2l/vocabulary/base/script#> as script {
 
     scalar property hasParameterValue [
         domain ScriptParameter
-        // Proabably need to change to some bottom value concept
+        // NOTE: Probably need to change this to some bottom value concept
         range xsd:string
     ]
 
@@ -27,8 +26,8 @@ vocabulary <http://ua.com.be/sdo2l/vocabulary/base/script#> as script {
         forward usesScriptParameter
     ]
 
-    concept CScript :> code:CCode
-    concept CppScript :> code:CppCode
-    concept PythonScript :> code:PythonCode
-    concept MATLABScript :> code:MATLABCode
+    concept CScript      :> ScriptData, code:CCode
+    concept CppScript    :> ScriptData, code:CppCode
+    concept PythonScript :> ScriptData, code:PythonCode
+    concept MATLABScript :> ScriptData, code:MATLABCode
 }

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

@@ -2,10 +2,8 @@ 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
     concept TabularData :> file:Data, file:File
     concept Cell        :> file:Data
@@ -37,7 +35,7 @@ vocabulary <http://ua.com.be/sdo2l/vocabulary/base/tabular#> as tabular {
     ]
 
     scalar property hasColumnId [
-        domain Row
+        domain Column
         // Maybe limit to positive integers here already, no need for shacl that way
         range xsd:int
     ]
@@ -74,14 +72,14 @@ vocabulary <http://ua.com.be/sdo2l/vocabulary/base/tabular#> as tabular {
     relation entity HasRows [
         from TabularData
         to Row
-        forward hasRow
+        forward hasRows
         reverse isRowOfTabularData
     ]
 
     relation entity HasColumns [
         from TabularData
         to Column
-        forward hasColumn
+        forward hasColumns
         reverse isColumnOfTabularData
     ]
 }