Skip to content

Commit d5fd5d7

Browse files
seidewitzseidewitz
authored
Merge pull request #530 from Systems-Modeling/ST6RI-735
ST6RI-735 Model-library related issue resolutions from SysML v2 Ballot #10
2 parents 130cf79 + 043cdff commit d5fd5d7

2 files changed

Lines changed: 66 additions & 53 deletions

File tree

‎sysml.library/Domain Libraries/Quantities and Units/ISQSpaceTime.sysml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,19 @@ standard library package ISQSpaceTime {
189189
/*
190190
* A singleton CartesianSpatial3dCoordinateFrame that can be used as a default universal Cartesian 3D coordinate frame.
191191
*/
192+
193+
attribute :>> mRefs default (SI::m, SI::m, SI::m) {
194+
doc /*
195+
* By default, the universalCartesianSpatial3dCoordinateFrame uses meters as the units on all three axes.
196+
*/
197+
}
198+
199+
attribute :>> transformation[0..0] {
200+
doc /*
201+
* The universalCartesianSpatial3dCoordinateFrame is the "top-level" coordinate frame, not nested in any other frame.
202+
*/
203+
}
204+
192205
}
193206

194207
attribute def CylindricalSpatial3dCoordinateFrame :> Spatial3dCoordinateFrame {

‎sysml.library/Systems Library/SysML.sysml‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ standard library package SysML {
4242
}
4343

4444
metadata def AnalysisCaseUsage specializes CaseUsage {
45-
derived ref item analysisAction : ActionUsage[0..*] subsets feature;
45+
derived ref item analysisAction : ActionUsage[0..*] subsets usage;
4646
derived ref item analysisCaseDefinition : AnalysisCaseDefinition[0..1] redefines caseDefinition;
4747
derived ref item resultExpression : Expression[0..1] subsets ownedFeature;
4848
}
@@ -52,8 +52,8 @@ standard library package SysML {
5252
}
5353

5454
metadata def AssignmentActionUsage specializes ActionUsage {
55-
derived ref item targetArgument : Expression[1..1];
56-
derived ref item valueExpression : Expression[1..1];
55+
derived ref item targetArgument : Expression[0..1];
56+
derived ref item valueExpression : Expression[0..1];
5757
derived ref item referent : Feature[1..1] subsets member;
5858
}
5959

@@ -127,36 +127,36 @@ standard library package SysML {
127127
metadata def Definition specializes Classifier {
128128
attribute isVariation : Boolean[1..1];
129129

130+
derived ref item 'variant' : Usage[0..*] subsets ownedMember;
131+
derived item variantMembership : VariantMembership[0..*] subsets ownedMembership;
132+
derived ref item usage : Usage[0..*] subsets feature;
133+
derived ref item directedUsage : Usage[0..*] subsets usage, directedFeature;
130134
derived ref item ownedUsage : Usage[0..*] subsets ownedFeature, usage;
135+
derived ref item ownedReference : ReferenceUsage[0..*] subsets ownedUsage;
136+
derived ref item ownedAttribute : AttributeUsage[0..*] subsets ownedUsage;
137+
derived ref item ownedEnumeration : EnumerationUsage[0..*] subsets ownedAttribute;
138+
derived ref item ownedOccurrence : OccurrenceUsage[0..*] subsets ownedUsage;
139+
derived ref item ownedItem : ItemUsage[0..*] subsets ownedOccurrence;
140+
derived ref item ownedPart : PartUsage[0..*] subsets ownedItem;
131141
derived ref item ownedPort : PortUsage[0..*] subsets ownedUsage;
132-
derived ref item directedUsage : Usage[0..*] subsets usage, directedFeature;
133-
derived ref item usage : Usage[0..*] subsets feature;
142+
derived ref item ownedConnection : ConnectorAsUsage[0..*] subsets ownedPart;
143+
derived ref item ownedFlow : FlowConnectionUsage[0..*] subsets ownedConnection;
144+
derived ref item ownedInterface : InterfaceUsage[0..*] subsets ownedConnection;
145+
derived ref item ownedAllocation : AllocationUsage[0..*] subsets ownedConnection;
146+
derived ref item ownedAction : ActionUsage[0..*] subsets ownedOccurrence;
134147
derived ref item ownedState : StateUsage[0..*] subsets ownedAction;
135-
derived ref item ownedConstraint : ConstraintUsage[0..*] subsets ownedOccurrence;
136148
derived ref item ownedTransition : TransitionUsage[0..*] subsets ownedUsage;
137-
derived ref item ownedRequirement : RequirementUsage[0..*] subsets ownedConstraint;
138149
derived ref item ownedCalculation : CalculationUsage[0..*] subsets ownedAction;
139-
derived item variantMembership : VariantMembership[0..*] subsets ownedMembership;
140-
derived ref item ownedAnalysisCase : AnalysisCaseUsage[0..*] subsets ownedCase;
141-
derived ref item 'variant' : Usage[0..*] subsets ownedMember;
150+
derived ref item ownedConstraint : ConstraintUsage[0..*] subsets ownedOccurrence;
151+
derived ref item ownedRequirement : RequirementUsage[0..*] subsets ownedConstraint;
152+
derived ref item ownedConcern : ConcernUsage[0..*] subsets ownedRequirement;
142153
derived ref item ownedCase : CaseUsage[0..*] subsets ownedCalculation;
143-
derived ref item ownedReference : ReferenceUsage[0..*] subsets ownedUsage;
144-
derived ref item ownedAction : ActionUsage[0..*] subsets ownedOccurrence;
145-
derived ref item ownedConnection : ConnectorAsUsage[0..*] subsets ownedPart;
146-
derived ref item ownedItem : ItemUsage[0..*] subsets ownedOccurrence;
147-
derived ref item ownedPart : PartUsage[0..*] subsets ownedItem;
148-
derived ref item ownedInterface : InterfaceUsage[0..*] subsets ownedConnection;
149-
derived ref item ownedAttribute : AttributeUsage[0..*] subsets ownedUsage;
154+
derived ref item ownedAnalysisCase : AnalysisCaseUsage[0..*] subsets ownedCase;
155+
derived ref item ownedVerificationCase : VerificationCaseUsage[0..*] subsets ownedCase;
156+
derived ref item ownedUseCase : UseCaseUsage[0..*] subsets ownedCase;
150157
derived ref item ownedView : ViewUsage[0..*] subsets ownedPart;
151158
derived ref item ownedViewpoint : ViewpointUsage[0..*] subsets ownedRequirement;
152159
derived ref item ownedRendering : RenderingUsage[0..*] subsets ownedPart;
153-
derived ref item ownedVerificationCase : VerificationCaseUsage[0..*] subsets ownedCase;
154-
derived ref item ownedEnumeration : EnumerationUsage[0..*] subsets ownedAttribute;
155-
derived ref item ownedAllocation : AllocationUsage[0..*] subsets ownedConnection;
156-
derived ref item ownedConcern : ConcernUsage[0..*] subsets ownedRequirement;
157-
derived ref item ownedOccurrence : OccurrenceUsage[0..*] subsets ownedUsage;
158-
derived ref item ownedUseCase : UseCaseUsage[0..*] subsets ownedCase;
159-
derived ref item ownedFlow : FlowConnectionUsage[0..*] subsets ownedConnection;
160160
derived ref item ownedMetadata : MetadataUsage[0..*] subsets ownedItem;
161161
}
162162

@@ -324,12 +324,12 @@ standard library package SysML {
324324
attribute reqId : String[0..1] redefines declaredShortName;
325325
derived attribute text : String[0..*];
326326

327-
derived ref item assumedConstraint : ConstraintUsage[0..*] subsets ownedFeature;
328-
derived ref item requiredConstraint : ConstraintUsage[0..*] subsets ownedFeature;
329327
derived ref item subjectParameter : Usage[1..1] subsets parameter, ownedUsage;
330-
derived ref item framedConcern : ConcernUsage[0..*] subsets requiredConstraint;
331328
derived ref item actorParameter : PartUsage[0..*] subsets ownedPart, parameter;
332329
derived ref item stakeholderParameter : PartUsage[0..*] subsets ownedPart, parameter;
330+
derived ref item assumedConstraint : ConstraintUsage[0..*] subsets ownedFeature;
331+
derived ref item requiredConstraint : ConstraintUsage[0..*] subsets ownedFeature;
332+
derived ref item framedConcern : ConcernUsage[0..*] subsets requiredConstraint;
333333
}
334334

335335
metadata def RequirementUsage specializes ConstraintUsage {
@@ -440,39 +440,39 @@ standard library package SysML {
440440
attribute isVariation : Boolean[1..1];
441441
derived attribute isReference : Boolean[1..1];
442442

443-
derived ref item nestedUsage : Usage[0..*] subsets ownedFeature, usage;
444-
derived ref item owningUsage : Usage[0..1] subsets owningType;
443+
derived ref item 'variant' : Usage[0..*] subsets ownedMember;
444+
derived item variantMembership : VariantMembership[0..*] subsets ownedMembership;
445445
derived ref item owningDefinition : Definition[0..1] subsets owningType;
446+
derived ref item owningUsage : Usage[0..1] subsets owningType;
447+
derived ref item definition : Classifier[0..*] redefines type;
448+
derived ref item usage : Usage[0..*] subsets feature;
449+
derived ref item directedUsage : Usage[0..*] subsets usage, directedFeature;
450+
derived ref item nestedUsage : Usage[0..*] subsets ownedFeature, usage;
451+
derived ref item nestedReference : ReferenceUsage[0..*] subsets nestedUsage;
452+
derived ref item nestedAttribute : AttributeUsage[0..*] subsets nestedUsage;
453+
derived ref item nestedEnumeration : EnumerationUsage[0..*] subsets nestedAttribute;
454+
derived ref item nestedOccurrence : OccurrenceUsage[0..*] subsets nestedUsage;
455+
derived ref item nestedItem : ItemUsage[0..*] subsets nestedOccurrence;
456+
derived ref item nestedPart : PartUsage[0..*] subsets nestedItem;
446457
derived ref item nestedPort : PortUsage[0..*] subsets nestedUsage;
458+
derived ref item nestedConnection : ConnectorAsUsage[0..*] subsets nestedPart;
459+
derived ref item nestedFlow : FlowConnectionUsage[0..*] subsets nestedConnection;
460+
derived ref item nestedInterface : InterfaceUsage[0..*] subsets nestedConnection;
461+
derived ref item nestedAllocation : AllocationUsage[0..*] subsets nestedConnection;
447462
derived ref item nestedAction : ActionUsage[0..*] subsets nestedOccurrence;
448463
derived ref item nestedState : StateUsage[0..*] subsets nestedAction;
449-
derived ref item nestedConstraint : ConstraintUsage[0..*] subsets nestedOccurrence;
450464
derived ref item nestedTransition : TransitionUsage[0..*] subsets nestedUsage;
451-
derived ref item nestedRequirement : RequirementUsage[0..*] subsets nestedConstraint;
452465
derived ref item nestedCalculation : CalculationUsage[0..*] subsets nestedAction;
453-
derived ref item directedUsage : Usage[0..*] subsets usage, directedFeature;
466+
derived ref item nestedConstraint : ConstraintUsage[0..*] subsets nestedOccurrence;
467+
derived ref item nestedRequirement : RequirementUsage[0..*] subsets nestedConstraint;
468+
derived ref item nestedConcern : ConcernUsage[0..*] subsets nestedRequirement;
454469
derived ref item nestedCase : CaseUsage[0..*] subsets nestedCalculation;
455470
derived ref item nestedAnalysisCase : AnalysisCaseUsage[0..*] subsets nestedCase;
456-
derived item variantMembership : VariantMembership[0..*] subsets ownedMembership;
457-
derived ref item usage : Usage[0..*] subsets feature;
458-
derived ref item 'variant' : Usage[0..*] subsets ownedMember;
459-
derived ref item nestedReference : ReferenceUsage[0..*] subsets nestedUsage;
460-
derived ref item nestedConnection : ConnectorAsUsage[0..*] subsets nestedPart;
461-
derived ref item nestedItem : ItemUsage[0..*] subsets nestedOccurrence;
462-
derived ref item nestedPart : PartUsage[0..*] subsets nestedItem;
463-
derived ref item nestedInterface : InterfaceUsage[0..*] subsets nestedConnection;
464-
derived ref item nestedAttribute : AttributeUsage[0..*] subsets nestedUsage;
471+
derived ref item nestedVerificationCase : VerificationCaseUsage[0..*] subsets nestedCase;
472+
derived ref item nestedUseCase : UseCaseUsage[0..*] subsets nestedCase;
465473
derived ref item nestedView : ViewUsage[0..*] subsets nestedPart;
466474
derived ref item nestedViewpoint : ViewpointUsage[0..*] subsets nestedRequirement;
467475
derived ref item nestedRendering : RenderingUsage[0..*] subsets nestedPart;
468-
derived ref item nestedVerificationCase : VerificationCaseUsage[0..*] subsets nestedCase;
469-
derived ref item nestedEnumeration : EnumerationUsage[0..*] subsets nestedAttribute;
470-
derived ref item nestedAllocation : AllocationUsage[0..*] subsets nestedConnection;
471-
derived ref item nestedConcern : ConcernUsage[0..*] subsets nestedRequirement;
472-
derived ref item nestedOccurrence : OccurrenceUsage[0..*] subsets nestedUsage;
473-
derived ref item definition : Classifier[0..*] redefines type;
474-
derived ref item nestedUseCase : UseCaseUsage[0..*] subsets nestedCase;
475-
derived ref item nestedFlow : FlowConnectionUsage[0..*] subsets nestedConnection;
476476
derived ref item nestedMetadata : MetadataUsage[0..*] subsets nestedItem;
477477
}
478478

@@ -500,8 +500,8 @@ standard library package SysML {
500500

501501
metadata def ViewDefinition specializes PartDefinition {
502502
derived ref item 'view' : ViewUsage[0..*] subsets usage;
503-
derived ref item satisfiedViewpoint : ViewpointUsage[0..*] subsets ownedUsage;
504-
derived ref item viewRendering : RenderingUsage[0..1] subsets ownedUsage;
503+
derived ref item satisfiedViewpoint : ViewpointUsage[0..*] subsets ownedRequirement;
504+
derived ref item viewRendering : RenderingUsage[0..1];
505505
derived ref item viewCondition : Expression[0..*] subsets ownedMember;
506506
}
507507

@@ -512,9 +512,9 @@ standard library package SysML {
512512

513513
metadata def ViewUsage specializes PartUsage {
514514
derived ref item viewDefinition : ViewDefinition[0..1] redefines partDefinition;
515-
derived ref item satisfiedViewpoint : ViewpointUsage[0..*] subsets nestedUsage;
515+
derived ref item satisfiedViewpoint : ViewpointUsage[0..*] subsets nestedRequirement;
516516
derived ref item exposedElement : Element[0..*] subsets member;
517-
derived ref item viewRendering : RenderingUsage[0..1] subsets nestedUsage;
517+
derived ref item viewRendering : RenderingUsage[0..1];
518518
derived ref item viewCondition : Expression[0..*] subsets ownedMember;
519519
}
520520

0 commit comments

Comments
 (0)