restructured the ontology

be.uantwerpen.msdl.vafl.ontology/README.md

@@ -1,6 +1,6 @@
 ## The System Ontology Bundle
 
-## The Experiment Ontology Bundle
+## The Context Ontology Bundle
 
 ## The Validity Ontology Bundle
 
@@ -8,7 +8,7 @@
 
 ## Annotations
 
-| Bundle Annotations                | Semantics                                                                    |
+| Vocabulary Bundle Annotations     | Semantics                                                                    |
 |-----------------------------------|------------------------------------------------------------------------------|
 | @dc:title                         | The title of the bundle                                                      |
 | @dc:publisher                     | The organization that publishes the bundle                                   |
@@ -19,9 +19,9 @@
 | @resource:laterVersion (optional) | The later version (if exists) of the deprecated bundle (format as NAMESPACE) |
 | @dc:creator                       | The organization/person that created the bundle (1 per annotation)           |
 | @dc:contributor                   | The organization/person that contributed to the bundle  (1 per annotation)   |
-| @rdfs:comment (optional)          | Comments                                                                     |
+| @rdfs:comment (optional)          | Comment about the ontology bundle                                            |
 
-| Ontology Annotations              | Semantics                                                                            |
+| Vocabulary Annotations            | Semantics                                                                            |
 |-----------------------------------|--------------------------------------------------------------------------------------|
 | @dc:title                         | The title of the ontology                                                            |
 | @dc:publisher                     | The organization that publishes the ontology                                         |
@@ -32,21 +32,22 @@
 | @resource:laterVersion (optional) | The later version (if exists) of a deprecated ontology (format as NAMESPACE)         |
 | @dc:creator                       | The organization/person that created the ontology                                    |
 | @dc:contributor (optional)        | The organization/person that contributed to the ontology                             |
-| @rdfs:comment (optional)          | Comments about the ontology                                                          |
+| @rdfs:comment (optional)          | Comment about the ontology                                                           |
 | @rdfs:isDefinedBy (optional)      | Document that defines concepts, from which the ontology is generated (format as DoI) |
-| @rdfs:seeAlso (optional)          | Document related to the ontology                                                     |
-
-
-| Type Annotations                  | Semantics                                                                            |
-|-----------------------------------|--------------------------------------------------------------------------------------|
-| @rdfs:label                       | True name of the type                                                                |
-| @resource:aka (optional)          | Other names of the type                                                              |
-| @dc:^description                  | Brief description of the type class                                                  |
-| @resource:definition              | Definition of the individuals of type                                                |
-| @owl:deprecated (optional)        | Type is deprecated                                                                   |
-| @owl:priorVersion (optional)      | The previous version (if exists) of the type (format as NAMESPACE)                   |
-| @owl:versionInfo (optional)       | The version identifier of the type                                                   |
-| @resource:laterVersion (optional) | The later version (if exists) of a deprecated type (format as NAMESPACE)             | 
-| @rdfs:comment (optional)          | Comments about the type                                                              |
-| @rdfs:isDefinedBy (optional)      | Documents that defines concepts, from which the type is generated (format as DoI)    |
-| @rdfs:seeAlso (optional)          | Documents related to the type                                                        |
+| @rdfs:seeAlso (optional)          | Document related to the ontology (format as DoI)                                     |
+
+
+| Type Annotations                  | Semantics                                                                        |
+|-----------------------------------|----------------------------------------------------------------------------------|
+| @rdfs:label                       | True name of the type                                                            |
+| @resource:aka (optional)          | Other names of the type                                                          |
+| @dc:^description                  | Brief description of the type class                                              |
+| @resource:definition              | Definition of the individuals of type                                            |
+| @resource:illustration (optional) | Illustrative example of an individual of the type                                |
+| @owl:deprecated (optional)        | Type is deprecated                                                               |
+| @owl:priorVersion (optional)      | The previous version (if exists) of the type (format as NAMESPACE)               |
+| @owl:versionInfo (optional)       | The version identifier of the type                                               |
+| @resource:laterVersion (optional) | The later version (if exists) of a deprecated type (format as NAMESPACE)         | 
+| @rdfs:comment (optional)          | Comment about the type                                                           |
+| @rdfs:isDefinedBy (optional)      | Document that defines concepts, from which the type is generated (format as DoI) |
+| @rdfs:seeAlso (optional)          | Document related to the type (format as DoI)                                     |

be.uantwerpen.msdl.vafl.ontology/build.gradle

@@ -36,7 +36,7 @@ ext.dataset = [
     // Name of dataset (matches one used in .fuseki.ttl file)
     name: 'vafl',
     // Root ontology IRI of the dataset
-    rootOntologyIri: 'http://msdl.uantwerpen.be/vafl/description/bundle',
+    rootOntologyIri: 'http://msdl.uantwerpen.be/description/bundle',
 ]
 
 /*
@@ -181,9 +181,9 @@ def pomConfig = {
     }
     developers {
         developer {
-            id "melaasar"
-            name "Maged Elaasar"
-            email "melaasar@gmail.com"
+            id "rakshit.mittal"
+            name "Rakshit Mittal"
+            email "rakshit.mittal@uantwerpen.be"
         }
     }
     scm {

be.uantwerpen.msdl.vafl.ontology/catalog.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
-	<rewriteURI uriStartString="http://msdl.uantwerpen.be/vafl/" rewritePrefix="src/oml/msdl.uantwerpen.be/vafl/"/>
+	<rewriteURI uriStartString="http://msdl.uantwerpen.be/vocabulary/" rewritePrefix="src/oml/msdl.uantwerpen.be/vocabulary/"/>
 	<rewriteURI uriStartString="http://" rewritePrefix="build/oml/"/>
 </catalog>

be.uantwerpen.msdl.vafl.ontology/representations.aird

@@ -4,26 +4,13 @@
     <semanticResources>src/oml/bipm.org/jcgm/vim4devices.oml</semanticResources>
     <semanticResources>src/oml/bipm.org/jcgm/vim4extensions-bundle.oml</semanticResources>
     <semanticResources>src/oml/bipm.org/jcgm/vim4uncertainty.oml</semanticResources>
-    <semanticResources>src/oml/msdl.uantwerpen.be/vafl/vocabulary/actor.oml</semanticResources>
     <semanticResources>build/oml/purl.org/dc/elements/1.1.oml</semanticResources>
-    <semanticResources>src/oml/msdl.uantwerpen.be/vafl/vocabulary/resource.oml</semanticResources>
     <semanticResources>build/oml/www.w3.org/2000/01/rdf-schema.oml</semanticResources>
     <semanticResources>build/oml/www.w3.org/2001/XMLSchema.oml</semanticResources>
-    <semanticResources>src/oml/msdl.uantwerpen.be/vafl/vocabulary/bundle.oml</semanticResources>
-    <semanticResources>src/oml/msdl.uantwerpen.be/vafl/vocabulary/experiment.oml</semanticResources>
-    <semanticResources>src/oml/msdl.uantwerpen.be/vafl/vocabulary/frame.oml</semanticResources>
-    <semanticResources>src/oml/msdl.uantwerpen.be/vafl/vocabulary/system.oml</semanticResources>
-    <semanticResources>src/oml/msdl.uantwerpen.be/vafl/vocabulary/requirement.oml</semanticResources>
     <semanticResources>build/oml/bipm.org/jcgm/vim4.oml</semanticResources>
     <semanticResources>build/oml/iso.org/iso-1087-1.oml</semanticResources>
     <semanticResources>build/oml/opencaesar.io/viewpoint.oml</semanticResources>
     <semanticResources>build/oml/www.w3.org/2002/07/owl.oml</semanticResources>
-    <semanticResources>src/oml/msdl.uantwerpen.be/vafl/vocabulary/human.oml</semanticResources>
-    <semanticResources>src/oml/msdl.uantwerpen.be/vafl/vocabulary/language.oml</semanticResources>
-    <semanticResources>src/oml/msdl.uantwerpen.be/vafl/vocabulary/model.oml</semanticResources>
-    <semanticResources>src/oml/msdl.uantwerpen.be/vafl/vocabulary/mpm.oml</semanticResources>
-    <semanticResources>src/oml/msdl.uantwerpen.be/vafl/vocabulary/validity.oml</semanticResources>
-    <semanticResources>src/oml/msdl.uantwerpen.be/vafl/vocabulary/workflow.oml</semanticResources>
     <semanticResources>src/oml/www.w3.org/sosa-bundle.oml</semanticResources>
     <semanticResources>src/oml/www.w3.org/sosa.oml</semanticResources>
     <semanticResources>src/oml/www.w3.org/ssn.oml</semanticResources>
@@ -67,7 +54,6 @@
     <semanticResources>build/oml/bipm.org/jcgm/vim4.1-systems-diagram.oml</semanticResources>
     <semanticResources>build/oml/iso.org/iso-80000-3.2.oml</semanticResources>
     <semanticResources>build/oml/iso.org/iso-80000-5.1.oml</semanticResources>
-    <semanticResources>src/oml/msdl.uantwerpen.be/vafl/vocabulary/architecture.oml</semanticResources>
     <semanticResources>src/oml/iso.org/ieee-iec-42010.oml</semanticResources>
     <semanticResources>src/oml/qudt.org/2.1/vocab/constant.oml</semanticResources>
     <semanticResources>src/oml/qudt.org/2.1/vocab/dimensionvector.oml</semanticResources>
@@ -75,6 +61,23 @@
     <semanticResources>src/oml/qudt.org/2.1/vocab/soqk.oml</semanticResources>
     <semanticResources>src/oml/qudt.org/2.1/vocab/unit.oml</semanticResources>
     <semanticResources>src/oml/qudt.org/2.1/schema/qudt.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/context/bundle.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/context/experiment.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/context/frame.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/validity/bundle.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/system/actor.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/system/architecture.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/system/bundle.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/system/human.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/system/language.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/system/model.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/system/mpm.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/system/requirement.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/system/resource.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/system/workflow.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/bundle.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/system/asset.oml</semanticResources>
+    <semanticResources>src/oml/msdl.uantwerpen.be/vocabulary/validity/indicators.oml</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_mGKn8OqhEe2TztGgS5kHFw">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/io.opencaesar.rosetta.sirius.viewpoint/description/oml.odesign#//@ownedViewpoints[name='Vocabularies']"/>
       <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_oGjLUOqhEe2TztGgS5kHFw" name="Actor Viewer" repPath="#_oGEDIOqhEe2TztGgS5kHFw" changeId="55a4fd29-a2c0-450b-89a7-55f33c8a6545">

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/architecture.oml

@@ -1,2 +0,0 @@
-vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/architecture#> as architecture {
-}

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/bundle.oml

@@ -1,5 +0,0 @@
-vocabulary bundle <http://msdl.uantwerpen.be/vafl/vocabulary/bundle#> as ^bundle {
-	includes <http://msdl.uantwerpen.be/vafl/vocabulary/resource#>
-	includes <http://msdl.uantwerpen.be/vafl/vocabulary/actor#>
-	includes <http://msdl.uantwerpen.be/vafl/vocabulary/human#>
-}

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/mpm.oml

@@ -1,2 +0,0 @@
-vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/mpm#> as mpm {
-}

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/workflow.oml

@@ -1,2 +0,0 @@
-vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/workflow#> as workflow {
-}

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vocabulary/bundle.oml

@@ -0,0 +1,2 @@
+vocabulary bundle <http://msdl.uantwerpen.be/vocabulary/bundle#> as ^bundle {
+}

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vocabulary/context/bundle.oml

@@ -0,0 +1,2 @@
+vocabulary bundle <http://msdl.uantwerpen.be/vocabulary/context/bundle#> as ^bundle {
+}

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/experiment.oml

@@ -3,6 +3,6 @@
 @dc:publisher "MSDL UAntwerpen Belgium"
 @dc:title "Experiment sub-ontology"
 @dc:^description "This ontology describes entities related to experiment modelling"
-vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/experiment#> as experiment {
+vocabulary <http://msdl.uantwerpen.be/vocabulary/context/experiment#> as experiment {
 	extends <http://purl.org/dc/elements/1.1/> as dc	
 }

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/frame.oml

@@ -3,12 +3,12 @@
 @dc:publisher "MSDL UAntwerpen Belgium"
 @dc:title "Frame sub-ontology"
 @dc:^description "This ontology describes entities related to contexts and frames"
-vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/frame#> as frame {
+vocabulary <http://msdl.uantwerpen.be/vocabulary/context/frame#> as frame {
 	
 	extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/resource#> as resource
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/system#> as system
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/requirement#> as requirement
+	extends <http://msdl.uantwerpen.be/vocabulary/system/resource#> as resource
+	extends <http://msdl.uantwerpen.be/vocabulary/system/asset#> as asset 
+	extends <http://msdl.uantwerpen.be/vocabulary/system/requirement#> as requirement
 	extends <http://purl.org/dc/elements/1.1/> as dc
 	
 	@rdfs:comment "The abstract set of circumstances that form the setting for an event"
@@ -34,7 +34,7 @@ vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/frame#> as frame {
     
     @rdfs:comment "The set of relations between systems and their contexts"
     relation entity SystemHaveContext [
-    	from system:System
+    	from asset:System
     	to SystemContext
     	forward hasSystemContext
     	reverse isContextOfSystem

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/actor.oml

@@ -3,9 +3,9 @@
 @dc:publisher "MSDL UAntwerpen Belgium"
 @dc:title "Actor sub-ontology"
 @dc:^description "This ontology describes entities related to actors, access and permission control"
-vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/actor#> as actor {
+vocabulary <http://msdl.uantwerpen.be/vocabulary/system/actor#> as actor {
 
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/resource#> as resource
+	extends <http://msdl.uantwerpen.be/vocabulary/system/resource#> as resource 
 	extends <http://purl.org/dc/elements/1.1/> as dc
 	
 	@resource:definition "The class of entities that perform activities"

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vocabulary/system/architecture.oml

@@ -0,0 +1,2 @@
+vocabulary <http://msdl.uantwerpen.be/vocabulary/system/architecture#> as architecture {
+}

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/system.oml

@@ -3,12 +3,12 @@
 @dc:publisher "MSDL UAntwerpen Belgium"
 @dc:title "System sub-ontology"
 @dc:^description "This ontology describes entities related to systems, assets, environment, and system-under-study"
-vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/system#> as system {
+vocabulary <http://msdl.uantwerpen.be/vocabulary/system/asset#> as asset {
 	
 	extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/resource#> as resource
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/requirement#> as requirement
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/frame#> as frame
+	extends <http://msdl.uantwerpen.be/vocabulary/system/resource#> as resource
+	extends <http://msdl.uantwerpen.be/vocabulary/system/requirement#> as requirement
+	extends <http://msdl.uantwerpen.be/vocabulary/context/frame#> as frame
     extends <http://purl.org/dc/elements/1.1/> as dc
     
     // Systems

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vocabulary/system/bundle.oml

@@ -0,0 +1,5 @@
+vocabulary bundle <http://msdl.uantwerpen.be/vocabulary/system/bundle#> as ^bundle {
+	includes <http://msdl.uantwerpen.be/vocabulary/system/resource#>
+	includes <http://msdl.uantwerpen.be/vocabulary/system/actor#>
+	includes <http://msdl.uantwerpen.be/vocabulary/system/human#>
+}

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/human.oml

@@ -3,11 +3,11 @@
 @dc:publisher "MSDL UAntwerpen Belgium"
 @dc:title "Human sub-ontology"
 @dc:^description "This ontology describes entities related to humans and stakeholders"
-vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/human#> as human {
+vocabulary <http://msdl.uantwerpen.be/vocabulary/system/human#> as human {
 	
 	extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/resource#> as resource
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/actor#> as actor
+	extends <http://msdl.uantwerpen.be/vocabulary/system/resource#> as resource
+	extends <http://msdl.uantwerpen.be/vocabulary/system/actor#> as actor
 	extends <http://purl.org/dc/elements/1.1/> as dc
 	
 	@resource:definition "The class of human elements"

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/language.oml

@@ -4,18 +4,18 @@
 @dc:publisher "MSDL UAntwerpen Belgium"
 @dc:title "Language sub-ontology"
 @dc:^description "This ontology describes entities related to language, syntax, formalism, and semantics"
-vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/language#> as ^language {
+vocabulary <http://msdl.uantwerpen.be/vocabulary/system/language#> as ^language {
 	
 	extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/resource#> as resource
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/system#> as system
+	extends <http://msdl.uantwerpen.be/vocabulary/system/resource#> as resource
+	extends <http://msdl.uantwerpen.be/vocabulary/system/asset#> as asset
 	extends <http://purl.org/dc/elements/1.1/> as dc
     
     //TODO: define all top-level entities as models as well
     
     @resource:definition "The set of concrete relizations of formalisms, with concrete syntaxes."
     @rdfs:isDefinedBy "Broman2012"
-    concept Language :> system:System [
+    concept Language :> asset:System [
     	restricts relation hasConcreteSyntax to min 1  
     ]
     
@@ -52,7 +52,7 @@ vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/language#> as ^language {
     // Syntax
 	
 	@resource:definition "The set of rules, principles, and processes that govern the structure of sentences in a language"
-	concept Syntax :> system:System
+	concept Syntax :> asset:System
 	
 	@resource:definition "The set of syntax that only capture the essence of language and its concepts indpendently from user-notation"
 	concept AbstractSyntax :> Syntax
@@ -102,7 +102,7 @@ vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/language#> as ^language {
     // Formalism
 	
 	@resource:definition "Formalisms are mathematical objects consisting of an abstract syntax and a formal semantics."
-	concept Formalism :> system:System [
+	concept Formalism :> asset:System [
 		restricts relation hasAbstractSyntax to exactly 1
 	]
 	
@@ -150,7 +150,7 @@ vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/language#> as ^language {
     // Semantics
     
     @resource:definition "The set of meanings of sentences of a language"
-	concept Semantics :> system:System
+	concept Semantics :> asset:System
     
     concept SemanticDomain :> Semantics
     

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/model.oml

@@ -1,18 +1,18 @@
-vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/model#> as model {
+vocabulary <http://msdl.uantwerpen.be/vocabulary/system/model#> as model {
 	
 	extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/resource#> as resource
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/system#> as system
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/requirement#> as requirement
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/language#> as ^language
+	extends <http://msdl.uantwerpen.be/vocabulary/system/resource#> as resource
+	extends <http://msdl.uantwerpen.be/vocabulary/system/asset#> as asset
+	extends <http://msdl.uantwerpen.be/vocabulary/system/requirement#> as requirement
+	extends <http://msdl.uantwerpen.be/vocabulary/system/language#> as ^language
 	
 	// Model
 	
 	@resource:definition "A model is a physical/virtual representation of salient aspects of a system-under-study"
 	@rdfs:isDefinedBy "HV"
-	concept Model :> system:System
+	concept Model :> asset:System
 	
-	relation entity ModelSubModel :> system:SystemSubsystem [
+	relation entity ModelSubModel :> asset:SystemSubsystem [
 		from Model
 		to Model
 		forward hasSubmodel

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vocabulary/system/mpm.oml

@@ -0,0 +1,2 @@
+vocabulary <http://msdl.uantwerpen.be/vocabulary/system/mpm#> as mpm {
+}

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/requirement.oml

@@ -4,11 +4,11 @@
 @dc:title "Requirements sub-ontology"
 @dc:^description "This ontology describes entities related to requirements engineering"
 @rdfs:seeAlso "ISO/IEC/IEEE-29148-2011"
-vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/requirement#> as requirement {
+vocabulary <http://msdl.uantwerpen.be/vocabulary/system/requirement#> as requirement {
 	
 	extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/resource#> as resource
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/system#> as system
+	extends <http://msdl.uantwerpen.be/vocabulary/system/resource#> as resource
+	extends <http://msdl.uantwerpen.be/vocabulary/system/asset#> as asset
 	extends <http://bipm.org/jcgm/vim4#> as vim4
 	extends <http://purl.org/dc/elements/1.1/> as dc
 	
@@ -32,7 +32,7 @@ vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/requirement#> as requireme
     
     @rdfs:comment "The set of relations between systems and their goals"
     relation entity SystemHaveGoal [
-    	from system:System
+    	from asset:System
     	to Goal
     	forward hasGoal
     	reverse isGoalOf

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/resource.oml

@@ -3,17 +3,15 @@
 @dc:publisher "MSDL UAntwerpen Belgium"
 @dc:title "Resource sub-ontology"
 @dc:^description "This ontology describes the top-level entities related to resources"
-vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/resource#> as resource {
+vocabulary <http://msdl.uantwerpen.be/vocabulary/system/resource#> as resource {
 	
 	extends <http://www.w3.org/2001/XMLSchema#> as xsd
 	extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
 	extends <http://purl.org/dc/elements/1.1/> as dc	
 	
-	annotation property seeAlsoDoI :> rdfs:seeAlso
 	annotation property definition :> rdfs:comment
 	annotation property aka :> rdfs:comment
 	annotation property illustration :> rdfs:comment
-	annotation property isDefinedByDOI :> rdfs:isDefinedBy
 	
 	@rdfs:comment "The class of all materials which help us satisfy our needs and wants"
 	aspect Resource

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vocabulary/system/workflow.oml

@@ -0,0 +1,2 @@
+vocabulary <http://msdl.uantwerpen.be/vocabulary/system/workflow#> as workflow {
+}

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vocabulary/validity/bundle.oml

@@ -0,0 +1,2 @@
+vocabulary bundle <http://msdl.uantwerpen.be/vocabulary/validity/bundle#> as ^bundle {
+}

be.uantwerpen.msdl.vafl.ontology/src/oml/msdl.uantwerpen.be/vafl/vocabulary/validity.oml

@@ -1,8 +1,8 @@
-@resource:seeAlsoDoI "10.1177/1046878102238606"
-vocabulary <http://msdl.uantwerpen.be/vafl/vocabulary/validity#> as validity {
+@rdfs:seeAlso "10.1177/1046878102238606"
+vocabulary <http://msdl.uantwerpen.be/vocabulary/validity/indicators#> as indicators {
 	
 	extends <http://www.w3.org/2000/01/rdf-schema#> as rdfs
-	extends <http://msdl.uantwerpen.be/vafl/vocabulary/resource#> as resource
+	extends <http://msdl.uantwerpen.be/vocabulary/system/resource#> as resource
 	
 	@rdfs:comment "Validity is the measure of a claim that it meets its goal. A model is a claim about the structure of a system. A simulation is a claim about the behavior of a system that is modeled. Hence, validity of models and simulations is a measure of their closeness to the system they intend to represent."
 	aspect Validity