Browse Source

correcting the model with the missing relationships.

Lucas Albertins 2 years ago
parent
commit
9c1ba131d4

+ 6 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/bundle.oml

@@ -1,3 +1,9 @@
 description bundle <http://ua.com.be/sdo2l/description/bundle#> as ^bundle {
 	uses <http://ua.com.be/sdo2l/vocabulary/bundle#>
+	includes <http://ua.com.be/sdo2l/description/definitions#>
+	includes <http://ua.com.be/sdo2l/description/requirements#>
+	includes <http://ua.com.be/sdo2l/description/structuralModels#>
+	includes <http://ua.com.be/sdo2l/description/systems#>
+	includes <http://ua.com.be/sdo2l/description/workflows#>
+	includes <http://ua.com.be/sdo2l/description/traces#>
 }

+ 1 - 5
examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/requirements.oml

@@ -2,16 +2,12 @@ description <http://ua.com.be/sdo2l/description/requirements#> as requirements {
 	uses <http://ua.com.be/sdo2l/vocabulary/base#> as base
 	uses <http://ua.com.be/sdo2l/vocabulary/requirement#> as req
 	extends <http://ua.com.be/sdo2l/description/systems#> as systems
-
-	uses <http://ua.com.be/sdo2l/vocabulary/processtraces#> as traces
-
-	extends <http://ua.com.be/sdo2l/description/workflows#> as workflows
 	
 	ci reqlist-car-system : req:RequirementList [
 		base:hasIdentifier "RL-01"
 		base:hasCanonicalName "CarSystemRequirementList"
 		base:hasDescription "The requirement list of the car system"
-		traces:relatesTo workflows:reqList-usage
+		//traces:relatesTo workflows:reqList-usage
 	]
 	
 	ci req01 : req:Requirement [

+ 10 - 3
examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/structuralModels.oml

@@ -3,15 +3,12 @@ description <http://ua.com.be/sdo2l/description/structuralModels#> as components
 	uses <http://www.w3.org/2001/XMLSchema#> as xsd
 	uses <http://ua.com.be/sdo2l/vocabulary/component#> as comp
 	uses <http://bipm.org/jcgm/vim4#> as vim4
-	uses <http://ua.com.be/sdo2l/vocabulary/processtraces#> as traces
 	extends <http://iso.org/iso-80000-4.1#> as iso-80000-4.1
-	extends <http://ua.com.be/sdo2l/description/workflows#> as workflows
 	
 	ci car-structural-model : comp:StructuralModel [
 		base:hasIdentifier "str-01"
 		base:hasCanonicalName "CarModel"
 		base:hasDescription "The structural model of a simple car with four wheels."
-		traces:relatesTo workflows:car-structural-model-usage
 	]
 		
 	ci car-component : comp:CarComponent [
@@ -20,6 +17,8 @@ description <http://ua.com.be/sdo2l/description/structuralModels#> as components
 	]
 	
 	ci car-massAttribute : comp:Attribute [
+		base:hasIdentifier "c1-mass"
+		base:hasCanonicalName "c1-mass att"
 		vim4:hasDoubleNumber "2000"^^xsd:double
 		vim4:characterizes car-component
 		vim4:unit iso-80000-4.1:kilogram
@@ -32,6 +31,8 @@ description <http://ua.com.be/sdo2l/description/structuralModels#> as components
 	]
 	
 	ci wheel1-massAttribute : comp:Attribute [
+		base:hasIdentifier "w1-mass"
+		base:hasCanonicalName "w1-mass att"
 		vim4:hasDoubleNumber "2"^^xsd:double
 		vim4:characterizes wheel1-component
 		vim4:unit iso-80000-4.1:kilogram
@@ -43,6 +44,8 @@ description <http://ua.com.be/sdo2l/description/structuralModels#> as components
 	]
 	
 	ci wheel2-massAttribute : comp:Attribute [
+		base:hasIdentifier "w2-mass"
+		base:hasCanonicalName "w2-mass att"
 		vim4:hasDoubleNumber "3"^^xsd:double
 		vim4:characterizes wheel2-component
 		vim4:unit iso-80000-4.1:kilogram
@@ -54,6 +57,8 @@ description <http://ua.com.be/sdo2l/description/structuralModels#> as components
 	]
 	
 	ci wheel3-massAttribute : comp:Attribute [
+		base:hasIdentifier "w3-mass"
+		base:hasCanonicalName "w3-mass att"
 		vim4:hasDoubleNumber "1"^^xsd:double
 		vim4:characterizes wheel3-component
 		vim4:unit iso-80000-4.1:kilogram
@@ -65,6 +70,8 @@ description <http://ua.com.be/sdo2l/description/structuralModels#> as components
 	]
 	
 	ci wheel4-massAttribute : comp:Attribute [
+		base:hasIdentifier "w4-mass"
+		base:hasCanonicalName "w4-mass att"
 		vim4:hasDoubleNumber "3"^^xsd:double
 		vim4:characterizes wheel4-component
 		vim4:unit iso-80000-4.1:kilogram

+ 16 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/traces.oml

@@ -4,11 +4,27 @@ description <http://ua.com.be/sdo2l/description/traces#> as traces {
 	extends <http://ua.com.be/sdo2l/description/requirements#> as requirements
 
 	extends <http://ua.com.be/sdo2l/description/structuralModels#> as components
+
+	uses <http://ua.com.be/sdo2l/vocabulary/base#> as base
 	
 	ci car-trace : traces:Trace [
+		base:hasIdentifier "t01"
+		base:hasCanonicalName "Car System - Trace 01"
 		traces:enacts wf:pm-car-system
 	]
 	
+	
+	ri reqList-car-relatesTo-reqList-usage : traces:RelatesTo [
+		from requirements:reqlist-car-system
+		to wf:reqList-usage
+	]
+//	
+//	ri carStructuralModel-relatesTo-car-structural-model-usage : traces:RelatesTo [
+//		from components:car-structural-model
+//		to wf:car-structural-model-usage
+//	]
+//	
+	
 	ci staev-req-elicitation : traces:StartingEvent [
 		traces:isFollowedBy endev-req-elicitation
 		traces:starts wf:requirement-elicitation-act

+ 20 - 2
examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/description/workflows.oml

@@ -3,6 +3,12 @@ description <http://ua.com.be/sdo2l/description/workflows#> as workflows {
 	//uses <http://www.w3.org/2001/XMLSchema#> as xsd
 	uses <http://ua.com.be/sdo2l/vocabulary/workflow#> as wf
 	extends <http://ua.com.be/sdo2l/description/definitions#> as defs
+	
+	
+
+
+
+	
 
 	
 	// the car PM
@@ -27,15 +33,22 @@ description <http://ua.com.be/sdo2l/description/workflows#> as workflows {
 	
 	// nodes
 	
-	ci init-node : wf:InitialNode
+	ci init-node : wf:InitialNode [
+		base:hasIdentifier "init01"
+		base:hasCanonicalName "Initial Node 01"
+	]
 	
 	ci requirement-elicitation-act : wf:Activity [
+		base:hasIdentifier "act01"
+		base:hasCanonicalName "Requirement Elicitation"
 		base:isDefinedBy defs:requirement-elicitation-act
 		base:hasUsageName "reqElicitation"
 		wf:outputs reqList-usage
 	]
 	
 	ci arquitectural-design-act : wf:Activity [
+		base:hasIdentifier "act02"
+		base:hasCanonicalName "Architectural Design"
 		base:isDefinedBy defs:architectural-design-act
 		base:hasUsageName "archDesign"
 		wf:isInputtedBy reqList-usage
@@ -43,11 +56,16 @@ description <http://ua.com.be/sdo2l/description/workflows#> as workflows {
 	]
 	
 	ci analysis-act : wf:Activity [
+		base:hasIdentifier "act03"
+		base:hasCanonicalName "Analysis"
 		base:isDefinedBy defs:analysis-act
 		base:hasUsageName "analysis"
 	]
 	
-	ci final-node : wf:FinalNode
+	ci final-node : wf:FinalNode [
+		base:hasIdentifier "finalnode01"
+		base:hasCanonicalName "Final Node 01"
+	]
 	
 	ref ci pm-car-system [
 		wf:coordinates init-node

+ 5 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/vocabulary/bundle.oml

@@ -1,3 +1,8 @@
 vocabulary bundle <http://ua.com.be/sdo2l/vocabulary/bundle#> as ^bundle {
+	includes <http://ua.com.be/sdo2l/vocabulary/base#>
+	includes <http://ua.com.be/sdo2l/vocabulary/component#>
+	includes <http://ua.com.be/sdo2l/vocabulary/processtraces#>
+	includes <http://ua.com.be/sdo2l/vocabulary/requirement#>
 	includes <http://ua.com.be/sdo2l/vocabulary/system#>
+	includes <http://ua.com.be/sdo2l/vocabulary/workflow#>
 }

+ 3 - 2
examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/vocabulary/processtraces.oml

@@ -90,9 +90,10 @@ vocabulary <http://ua.com.be/sdo2l/vocabulary/processtraces#> as traces {
 		from Artifact
 		to base:WorkflowArtifact
 		forward relatesTo
+		//reverse relatedTo
 		symmetric 
 		irreflexive
-		functional
+		//functional
 	]
 	
 	relation entity UpdatesVersion [
@@ -100,7 +101,7 @@ vocabulary <http://ua.com.be/sdo2l/vocabulary/processtraces#> as traces {
 		to Artifact
 		forward updatesVersion
 		reverse isVersionUpdatedBy
-		symmetric
+		asymmetric
 		irreflexive
 	]
 

+ 1 - 1
examples/oml/SystemDesignOntology2Layers/src/oml/ua.com.be/sdo2l/vocabulary/requirement.oml

@@ -15,7 +15,7 @@ vocabulary <http://ua.com.be/sdo2l/vocabulary/requirement#> as requirement {
 		irreflexive
 	]
 	
-	concept RequirementList :> base:IdentifiedThing, traces:Artifact//, base:WorkflowArtifact
+	concept RequirementList :> base:IdentifiedThing, traces:Artifact
 	
 	relation entity Groups [
 		from RequirementList