Skip to content

Commit 856b2cb

Browse files
authored
Merge pull request #444 from Systems-Modeling/ST6RI-634
ST6RI-634 Update StandardViewDefinitions library package
2 parents 0c91e52 + 987042e commit 856b2cb

2 files changed

Lines changed: 85 additions & 256 deletions

File tree

org.omg.sysml.xpect.tests/library.systems/StandardViewDefinitions.sysml

Lines changed: 43 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,20 @@ standard library package StandardViewDefinitions {
44
*/
55
import SysML::*;
66

7-
view def <cv> ContainmentView {
8-
doc /*
9-
* View definition to present the hierarchical membership structure of model
10-
* elements starting from an exposed root element.
11-
* The typical rendering in graphical notation is as an indented list of rows,
12-
* consisting of dynamically collapsible-expandable nodes that represent
13-
* branches and leaves of the tree.
14-
*/
15-
}
16-
17-
view def <mv> MemberView {
7+
view def <gv> GeneralView {
188
doc /*
199
* View definition to present any members of exposed model element(s).
20-
* This is the most general view, that enables presentation of any model
21-
* element.
22-
* The typical rendering in graphical notation is as a graph of nodes and edges.
23-
*/
24-
}
25-
26-
view def <pv> PackageView {
27-
doc /*
28-
* View definition to present package structure and content.
29-
* Owned or imported packages are presented as nodes and their members can
30-
* be presented in textual compartments.
31-
*/
32-
}
33-
34-
view def <duv> DefinitionAndUsageView {
35-
doc /*
36-
* View definition to present Definition and Usage members of exposed model
37-
* element(s), as well as the relationships between them.
38-
*/
39-
}
40-
41-
view def <tv> TreeView {
42-
doc /*
43-
* View definition to present exposed features as nodes, and membership
44-
* relationships as edges.
10+
* This is the most general view, enabling presentation of any model element.
4511
* The typical rendering in graphical notation is as a graph of nodes and edges.
12+
* Specializations of GeneralView can be specified through appropriate selection of filters, e.g.:
13+
* - package view, filtering on Package, Package containment, package Import
14+
* - definition and usage view, filtering on Definition, Usage, Specialization, FeatureTyping (covering defined by)
15+
* - requirement view, filtering on RequirementDefinition, RequirementUsage, Specialization, FeatureTyping,
16+
* SatisfyRequirementUsage, AllocationDefinition, AllocationUsage,
17+
* - view and viewpoint view, filtering on ViewDefinition, ViewUsage, ViewpointDefinition, ViewpointUsage,
18+
* RenderingDefinition, RenderingUsage, ConcernDefinition, ConcernUsage, StakeholderMembership, ...
19+
* - language extension view, filtering on Metaclass, MetadataFeature, MetadataAccessExpression, ...
20+
* Note: filters are specified by referencing concepts from the KerML.kerml and SysML.sysml standard library packages.
4621
*/
4722
}
4823

@@ -103,100 +78,18 @@ standard library package StandardViewDefinitions {
10378
*/
10479
}
10580

106-
view def <ucv> UseCaseView {
107-
doc /*
108-
* View definition to present exposed use cases.
109-
* Valid nodes and edges in a UseCaseView are:
110-
* - Use case, with subject
111-
* - Actor
112-
* - Include relationship
113-
* - Objective
114-
* - Compartments
115-
* - Binding connection between an actor and an input parameter with same
116-
* name (TBC)
117-
*/
118-
}
119-
120-
view def <rv> RequirementView {
121-
doc /*
122-
* View definition to present exposed requirements and their relationships.
123-
* Valid nodes and edges in a UseCaseView are:
124-
* - Requirement, including possible metadata
125-
* - Nested requirements
126-
* - Objective
127-
* - Requirement allocation
128-
* - Requirement satisfaction (shown in a satisfy requirements compartment)
129-
* - Verified by
130-
*/
131-
}
132-
133-
view def <acv> AnalysisCaseView {
134-
doc /*
135-
* View definition to present exposed analysis cases and their relationships.
136-
* Valid nodes and edges in an AnalysisCaseView are:
137-
* - Analysis case
138-
* - Actor
139-
* - Objective
140-
* - Action
141-
* - Calculation
142-
* - Compartments
143-
* - Binding connection between an actor and an input parameter with same
144-
* name (TBC)
145-
*/
146-
}
147-
148-
view def <vcv> VerificationCaseView {
81+
view def <cv> CaseView {
14982
doc /*
150-
* View definition to present exposed verification cases and their
151-
* relationships.
152-
* Valid nodes and edges in a VerificationCaseView are:
153-
* - Verification case, with subject, i.e., unit/article under verification
154-
* - Actor
155-
* - Objective
156-
* - Action, e.g., steps needed to perform the verification
157-
* - Requirement
158-
* - Verify relationship
159-
* - Compartments
160-
* - Binding connection between an actor and an input parameter with same
161-
* name (TBC)
162-
*/
163-
}
164-
165-
view def <vvv> ViewAndViewpointView {
166-
doc /*
167-
* View definition to present exposed View and Viewpoint .
168-
* Valid nodes and edges in a ViewAndViewpointView are:
169-
* - View definition
170-
* - View usage
171-
* - Viewpoint definition
172-
* - Viewpoint Usage
173-
* - Stakeholder
174-
* - Concern definition
175-
* - Concern Usage
176-
* - Expose
177-
* - Exposed element
178-
* - Subclassification
179-
* - Defined by
180-
* - Subset
181-
* - Redefinition
182-
*/
183-
}
184-
185-
view def <lev> LanguageExtensionView {
186-
doc /*
187-
* View definition to present an exposed metadata definition used to extend
188-
* a library concept.
189-
*/
190-
}
191-
192-
view def <gv> GridView {
193-
doc /*
194-
* View definition to present exposed model elements and their relationships,
195-
* arranged in a rectangular grid.
196-
* GridView is the generalization of the following more specialized views:
197-
* - Tabular view
198-
* - Data value tabular view
199-
* - Relationship matrix view
83+
* View definition to present use cases, analysis cases or verification cases.
84+
* In one view in principle only one of use cases, analysis cases or verification cases is rendered.
85+
* - Valid nodes and edges in any CaseView are: CaseDefinition, CaseUsage, SubjectMembership,
86+
* ObjectiveMembership, ActorMembership, RequirementDefinition, RequirementUsage
87+
* - Valid nodes and edges in a use case view are: UseCaseDefinition, UseCaseUsage,
88+
* IncludeUseCaseUsage, ...
89+
* - Valid nodes and edges in an analysis view are: AnalysisCaseDefinition, AnalysisCaseUsage,
90+
* ...
91+
* - Valid nodes and edges in a verification view are: VerificationCaseDefinition, VerificationCaseUsage,
92+
* ...
20093
*/
20194
}
20295

@@ -221,4 +114,25 @@ standard library package StandardViewDefinitions {
221114
* - color maps
222115
*/
223116
}
117+
118+
view def <grv> GridView {
119+
doc /*
120+
* View definition to present exposed model elements and their relationships,
121+
* arranged in a rectangular grid.
122+
* GridView is the generalization of the following more specialized views:
123+
* - Tabular view
124+
* - Data value tabular view
125+
* - Relationship matrix view, e.g. presenting allocation or dependency relationships
126+
*/
127+
}
128+
129+
view def <bv> BrowserView {
130+
doc /*
131+
* View definition to present the hierarchical membership structure of model
132+
* elements starting from one or more exposed root elements.
133+
* The typical rendering in graphical notation is as an indented list of rows,
134+
* consisting of dynamically collapsible-expandable nodes that represent
135+
* branches and leaves of the tree, as in graphical user interface widgets.
136+
*/
137+
}
224138
}

sysml.library/Systems Library/StandardViewDefinitions.sysml

Lines changed: 42 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,20 @@ standard library package StandardViewDefinitions {
44
*/
55
import SysML::*;
66

7-
view def <cv> ContainmentView {
8-
doc /*
9-
* View definition to present the hierarchical membership structure of model
10-
* elements starting from an exposed root element.
11-
* The typical rendering in graphical notation is as an indented list of rows,
12-
* consisting of dynamically collapsible-expandable nodes that represent
13-
* branches and leaves of the tree.
14-
*/
15-
}
16-
17-
view def <mv> MemberView {
7+
view def <gv> GeneralView {
188
doc /*
199
* View definition to present any members of exposed model element(s).
2010
* This is the most general view, enabling presentation of any model element.
2111
* The typical rendering in graphical notation is as a graph of nodes and edges.
22-
*/
23-
}
24-
25-
view def <pv> PackageView {
26-
doc /*
27-
* View definition to present package structure and content.
28-
* Owned or imported packages are presented as nodes and their members can
29-
* be presented in textual compartments.
30-
*/
31-
}
32-
33-
view def <duv> DefinitionAndUsageView {
34-
doc /*
35-
* View definition to present Definition and Usage members of exposed model
36-
* element(s), as well as the relationships between them.
37-
*/
38-
}
39-
40-
view def <tv> TreeView {
41-
doc /*
42-
* View definition to present exposed features as nodes, and membership
43-
* relationships as edges.
44-
* The typical rendering in graphical notation is as a graph of nodes and edges.
12+
* Specializations of GeneralView can be specified through appropriate selection of filters, e.g.:
13+
* - package view, filtering on Package, Package containment, package Import
14+
* - definition and usage view, filtering on Definition, Usage, Specialization, FeatureTyping (covering defined by)
15+
* - requirement view, filtering on RequirementDefinition, RequirementUsage, Specialization, FeatureTyping,
16+
* SatisfyRequirementUsage, AllocationDefinition, AllocationUsage,
17+
* - view and viewpoint view, filtering on ViewDefinition, ViewUsage, ViewpointDefinition, ViewpointUsage,
18+
* RenderingDefinition, RenderingUsage, ConcernDefinition, ConcernUsage, StakeholderMembership, ...
19+
* - language extension view, filtering on Metaclass, MetadataFeature, MetadataAccessExpression, ...
20+
* Note: filters are specified by referencing concepts from the KerML.kerml and SysML.sysml standard library packages.
4521
*/
4622
}
4723

@@ -102,100 +78,18 @@ standard library package StandardViewDefinitions {
10278
*/
10379
}
10480

105-
view def <ucv> UseCaseView {
106-
doc /*
107-
* View definition to present exposed use cases.
108-
* Valid nodes and edges in a UseCaseView are:
109-
* - Use case, with subject
110-
* - Actor
111-
* - Include relationship
112-
* - Objective
113-
* - Compartments
114-
* - Binding connection between an actor and an input parameter with same
115-
* name (TBC)
116-
*/
117-
}
118-
119-
view def <rv> RequirementView {
120-
doc /*
121-
* View definition to present exposed requirements and their relationships.
122-
* Valid nodes and edges in a UseCaseView are:
123-
* - Requirement, including possible metadata
124-
* - Nested requirements
125-
* - Objective
126-
* - Requirement allocation
127-
* - Requirement satisfaction (shown in a satisfy requirements compartment)
128-
* - Verified by
129-
*/
130-
}
131-
132-
view def <acv> AnalysisCaseView {
133-
doc /*
134-
* View definition to present exposed analysis cases and their relationships.
135-
* Valid nodes and edges in an AnalysisCaseView are:
136-
* - Analysis case
137-
* - Actor
138-
* - Objective
139-
* - Action
140-
* - Calculation
141-
* - Compartments
142-
* - Binding connection between an actor and an input parameter with same
143-
* name (TBC)
144-
*/
145-
}
146-
147-
view def <vcv> VerificationCaseView {
81+
view def <cv> CaseView {
14882
doc /*
149-
* View definition to present exposed verification cases and their
150-
* relationships.
151-
* Valid nodes and edges in a VerificationCaseView are:
152-
* - Verification case, with subject, i.e., unit/article under verification
153-
* - Actor
154-
* - Objective
155-
* - Action, e.g., steps needed to perform the verification
156-
* - Requirement
157-
* - Verify relationship
158-
* - Compartments
159-
* - Binding connection between an actor and an input parameter with the
160-
* same name
161-
*/
162-
}
163-
164-
view def <vvv> ViewAndViewpointView {
165-
doc /*
166-
* View definition to present exposed View and Viewpoint.
167-
* Valid nodes and edges in a ViewAndViewpointView are:
168-
* - View definition
169-
* - View usage
170-
* - Viewpoint definition
171-
* - Viewpoint Usage
172-
* - Stakeholder
173-
* - Concern definition
174-
* - Concern Usage
175-
* - Expose
176-
* - Exposed element
177-
* - Subclassification
178-
* - Defined by
179-
* - Subset
180-
* - Redefinition
181-
*/
182-
}
183-
184-
view def <lev> LanguageExtensionView {
185-
doc /*
186-
* View definition to present an exposed metadata definition used to extend
187-
* a library concept.
188-
*/
189-
}
190-
191-
view def <gv> GridView {
192-
doc /*
193-
* View definition to present exposed model elements and their relationships,
194-
* arranged in a rectangular grid.
195-
* GridView is the generalization of the following more specialized views:
196-
* - Tabular view
197-
* - Data value tabular view
198-
* - Relationship matrix view
83+
* View definition to present use cases, analysis cases or verification cases.
84+
* In one view in principle only one of use cases, analysis cases or verification cases is rendered.
85+
* - Valid nodes and edges in any CaseView are: CaseDefinition, CaseUsage, SubjectMembership,
86+
* ObjectiveMembership, ActorMembership, RequirementDefinition, RequirementUsage
87+
* - Valid nodes and edges in a use case view are: UseCaseDefinition, UseCaseUsage,
88+
* IncludeUseCaseUsage, ...
89+
* - Valid nodes and edges in an analysis view are: AnalysisCaseDefinition, AnalysisCaseUsage,
90+
* ...
91+
* - Valid nodes and edges in a verification view are: VerificationCaseDefinition, VerificationCaseUsage,
92+
* ...
19993
*/
20094
}
20195

@@ -220,4 +114,25 @@ standard library package StandardViewDefinitions {
220114
* - color maps
221115
*/
222116
}
117+
118+
view def <grv> GridView {
119+
doc /*
120+
* View definition to present exposed model elements and their relationships,
121+
* arranged in a rectangular grid.
122+
* GridView is the generalization of the following more specialized views:
123+
* - Tabular view
124+
* - Data value tabular view
125+
* - Relationship matrix view, e.g. presenting allocation or dependency relationships
126+
*/
127+
}
128+
129+
view def <bv> BrowserView {
130+
doc /*
131+
* View definition to present the hierarchical membership structure of model
132+
* elements starting from one or more exposed root elements.
133+
* The typical rendering in graphical notation is as an indented list of rows,
134+
* consisting of dynamically collapsible-expandable nodes that represent
135+
* branches and leaves of the tree, as in graphical user interface widgets.
136+
*/
137+
}
223138
}

0 commit comments

Comments
 (0)