Skip to content

Commit 96d80ef

Browse files
seidewitzseidewitz
committed
SYSML21-324 Used keyword "flow" in flows and successionFlows decls.
- Also corrected the training model Flow Definition Example. - Updated the model library index.
1 parent 6fe9d37 commit 96d80ef

File tree

4 files changed

+264
-6
lines changed

4 files changed

+264
-6
lines changed

‎org.omg.sysml.xpect.tests/library.systems/Flows.sysml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ standard library package Flows {
103103
*/
104104
}
105105

106-
abstract message flows: Flow[0..*] nonunique :> messages, flowTransfers {
106+
abstract flow flows: Flow[0..*] nonunique :> messages, flowTransfers {
107107
doc
108108
/*
109109
* flows is the base feature for FlowUsages that identify their source output
@@ -114,7 +114,7 @@ standard library package Flows {
114114
end occurrence target: Occurrence :>> Flow::target, messages::target, flowTransfers::target;
115115
}
116116

117-
abstract message successionFlows: SuccessionFlow[0..*] nonunique :> flows, flowTransfersBefore {
117+
abstract flow successionFlows: SuccessionFlow[0..*] nonunique :> flows, flowTransfersBefore {
118118
doc
119119
/*
120120
* successionFlows is the base feature of all SuccessionFlowUsages.

‎sysml.library/.index.json‎

Lines changed: 259 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172228,6 +172228,92 @@
172228172228
"voids",
172229172229
"withoutOccurrences"
172230172230
],
172231+
"ShapeItems::CircularCone::base::edges": [
172232+
"StructuredCurve",
172233+
"StructuredPoint",
172234+
"StructuredSurface",
172235+
"boundingShapes",
172236+
"cellOrientation",
172237+
"checkedConstraints",
172238+
"differencesOf",
172239+
"dispatchScope",
172240+
"done",
172241+
"edges",
172242+
"enactedPerformances",
172243+
"envelopingShapes",
172244+
"faces",
172245+
"immediatePredecessors",
172246+
"immediateSuccessors",
172247+
"incomingTransferSort",
172248+
"incomingTransfers",
172249+
"incomingTransfersToSelf",
172250+
"innerSpaceDimension",
172251+
"intersectionsOf",
172252+
"involvingPerformances",
172253+
"isClosed",
172254+
"isDispatch",
172255+
"isRunToCompletion",
172256+
"isSolid",
172257+
"justOutsideOfOccurrences",
172258+
"largerSpace",
172259+
"length",
172260+
"localClock",
172261+
"longerOccurrence",
172262+
"matingOccurrences",
172263+
"middleTimeSlice",
172264+
"outerSpaceDimension",
172265+
"outgoingTransfers",
172266+
"outgoingTransfersFromSelf",
172267+
"outsideOfOccurrences",
172268+
"ownedPerformances",
172269+
"portionOf",
172270+
"portionOfLife",
172271+
"portions",
172272+
"predecessors",
172273+
"radius",
172274+
"runToCompletionScope",
172275+
"sameLifeOccurrences",
172276+
"self",
172277+
"semiMajorAxis",
172278+
"semiMinorAxis",
172279+
"shape",
172280+
"shorterOccurrence",
172281+
"smallerSpace",
172282+
"snapshotOf",
172283+
"snapshots",
172284+
"spaceBoundary",
172285+
"spaceBoundaryOf",
172286+
"spaceEnclosedOccurrences",
172287+
"spaceInterior",
172288+
"spaceInteriorOf",
172289+
"spaceShotOf",
172290+
"spaceShots",
172291+
"spaceSliceOf",
172292+
"spaceSlices",
172293+
"spaceTimeCoincidentOccurrences",
172294+
"spaceTimeEnclosedOccurrences",
172295+
"spaceTimeEnclosedPoints",
172296+
"start",
172297+
"structuredSpaceBoundary",
172298+
"structuredSpaceObjectCells",
172299+
"subitems",
172300+
"subobjects",
172301+
"suboccurrences",
172302+
"subparts",
172303+
"successors",
172304+
"superoccurrence",
172305+
"surroundedByOccurrences",
172306+
"that",
172307+
"this",
172308+
"timeCoincidentOccurrences",
172309+
"timeEnclosedOccurrences",
172310+
"timeSliceOf",
172311+
"timeSlices",
172312+
"unionsOf",
172313+
"vertices",
172314+
"voids",
172315+
"withoutOccurrences"
172316+
],
172231172317
"ShapeItems::CircularCone::radius": [
172232172318
"boundMatch",
172233172319
"contravariantOrder",
@@ -172450,6 +172536,92 @@
172450172536
"voids",
172451172537
"withoutOccurrences"
172452172538
],
172539+
"ShapeItems::CircularCylinder::af::edges": [
172540+
"StructuredCurve",
172541+
"StructuredPoint",
172542+
"StructuredSurface",
172543+
"boundingShapes",
172544+
"cellOrientation",
172545+
"checkedConstraints",
172546+
"differencesOf",
172547+
"dispatchScope",
172548+
"done",
172549+
"edges",
172550+
"enactedPerformances",
172551+
"envelopingShapes",
172552+
"faces",
172553+
"immediatePredecessors",
172554+
"immediateSuccessors",
172555+
"incomingTransferSort",
172556+
"incomingTransfers",
172557+
"incomingTransfersToSelf",
172558+
"innerSpaceDimension",
172559+
"intersectionsOf",
172560+
"involvingPerformances",
172561+
"isClosed",
172562+
"isDispatch",
172563+
"isRunToCompletion",
172564+
"isSolid",
172565+
"justOutsideOfOccurrences",
172566+
"largerSpace",
172567+
"length",
172568+
"localClock",
172569+
"longerOccurrence",
172570+
"matingOccurrences",
172571+
"middleTimeSlice",
172572+
"outerSpaceDimension",
172573+
"outgoingTransfers",
172574+
"outgoingTransfersFromSelf",
172575+
"outsideOfOccurrences",
172576+
"ownedPerformances",
172577+
"portionOf",
172578+
"portionOfLife",
172579+
"portions",
172580+
"predecessors",
172581+
"radius",
172582+
"runToCompletionScope",
172583+
"sameLifeOccurrences",
172584+
"self",
172585+
"semiMajorAxis",
172586+
"semiMinorAxis",
172587+
"shape",
172588+
"shorterOccurrence",
172589+
"smallerSpace",
172590+
"snapshotOf",
172591+
"snapshots",
172592+
"spaceBoundary",
172593+
"spaceBoundaryOf",
172594+
"spaceEnclosedOccurrences",
172595+
"spaceInterior",
172596+
"spaceInteriorOf",
172597+
"spaceShotOf",
172598+
"spaceShots",
172599+
"spaceSliceOf",
172600+
"spaceSlices",
172601+
"spaceTimeCoincidentOccurrences",
172602+
"spaceTimeEnclosedOccurrences",
172603+
"spaceTimeEnclosedPoints",
172604+
"start",
172605+
"structuredSpaceBoundary",
172606+
"structuredSpaceObjectCells",
172607+
"subitems",
172608+
"subobjects",
172609+
"suboccurrences",
172610+
"subparts",
172611+
"successors",
172612+
"superoccurrence",
172613+
"surroundedByOccurrences",
172614+
"that",
172615+
"this",
172616+
"timeCoincidentOccurrences",
172617+
"timeEnclosedOccurrences",
172618+
"timeSliceOf",
172619+
"timeSlices",
172620+
"unionsOf",
172621+
"vertices",
172622+
"voids",
172623+
"withoutOccurrences"
172624+
],
172453172625
"ShapeItems::CircularCylinder::base": [
172454172626
"StructuredCurve",
172455172627
"StructuredPoint",
@@ -172537,6 +172709,92 @@
172537172709
"voids",
172538172710
"withoutOccurrences"
172539172711
],
172712+
"ShapeItems::CircularCylinder::base::edges": [
172713+
"StructuredCurve",
172714+
"StructuredPoint",
172715+
"StructuredSurface",
172716+
"boundingShapes",
172717+
"cellOrientation",
172718+
"checkedConstraints",
172719+
"differencesOf",
172720+
"dispatchScope",
172721+
"done",
172722+
"edges",
172723+
"enactedPerformances",
172724+
"envelopingShapes",
172725+
"faces",
172726+
"immediatePredecessors",
172727+
"immediateSuccessors",
172728+
"incomingTransferSort",
172729+
"incomingTransfers",
172730+
"incomingTransfersToSelf",
172731+
"innerSpaceDimension",
172732+
"intersectionsOf",
172733+
"involvingPerformances",
172734+
"isClosed",
172735+
"isDispatch",
172736+
"isRunToCompletion",
172737+
"isSolid",
172738+
"justOutsideOfOccurrences",
172739+
"largerSpace",
172740+
"length",
172741+
"localClock",
172742+
"longerOccurrence",
172743+
"matingOccurrences",
172744+
"middleTimeSlice",
172745+
"outerSpaceDimension",
172746+
"outgoingTransfers",
172747+
"outgoingTransfersFromSelf",
172748+
"outsideOfOccurrences",
172749+
"ownedPerformances",
172750+
"portionOf",
172751+
"portionOfLife",
172752+
"portions",
172753+
"predecessors",
172754+
"radius",
172755+
"runToCompletionScope",
172756+
"sameLifeOccurrences",
172757+
"self",
172758+
"semiMajorAxis",
172759+
"semiMinorAxis",
172760+
"shape",
172761+
"shorterOccurrence",
172762+
"smallerSpace",
172763+
"snapshotOf",
172764+
"snapshots",
172765+
"spaceBoundary",
172766+
"spaceBoundaryOf",
172767+
"spaceEnclosedOccurrences",
172768+
"spaceInterior",
172769+
"spaceInteriorOf",
172770+
"spaceShotOf",
172771+
"spaceShots",
172772+
"spaceSliceOf",
172773+
"spaceSlices",
172774+
"spaceTimeCoincidentOccurrences",
172775+
"spaceTimeEnclosedOccurrences",
172776+
"spaceTimeEnclosedPoints",
172777+
"start",
172778+
"structuredSpaceBoundary",
172779+
"structuredSpaceObjectCells",
172780+
"subitems",
172781+
"subobjects",
172782+
"suboccurrences",
172783+
"subparts",
172784+
"successors",
172785+
"superoccurrence",
172786+
"surroundedByOccurrences",
172787+
"that",
172788+
"this",
172789+
"timeCoincidentOccurrences",
172790+
"timeEnclosedOccurrences",
172791+
"timeSliceOf",
172792+
"timeSlices",
172793+
"unionsOf",
172794+
"vertices",
172795+
"voids",
172796+
"withoutOccurrences"
172797+
],
172540172798
"ShapeItems::CircularCylinder::radius": [
172541172799
"boundMatch",
172542172800
"contravariantOrder",
@@ -279862,5 +280120,5 @@
279862280120
"withoutOccurrences"
279863280121
]
279864280122
},
279865-
"checksum": "7ec0ee4d234b341e1d816592b451dfe96f4ce66506d984203475b61d57d1e177"
280123+
"checksum": "ea2f43077479bc3e427258f94ea33a290a9b038039dac2983c292441b6e0e878"
279866280124
}

‎sysml.library/Systems Library/Flows.sysml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ standard library package Flows {
103103
*/
104104
}
105105

106-
abstract message flows: Flow[0..*] nonunique :> messages, flowTransfers {
106+
abstract flow flows: Flow[0..*] nonunique :> messages, flowTransfers {
107107
doc
108108
/*
109109
* flows is the base feature for FlowUsages that identify their source output
@@ -114,7 +114,7 @@ standard library package Flows {
114114
end occurrence target: Occurrence :>> Flow::target, messages::target, flowTransfers::target;
115115
}
116116

117-
abstract message successionFlows: SuccessionFlow[0..*] nonunique :> flows, flowTransfersBefore {
117+
abstract flow successionFlows: SuccessionFlow[0..*] nonunique :> flows, flowTransfersBefore {
118118
doc
119119
/*
120120
* successionFlows is the base feature of all SuccessionFlowUsages.

‎sysml/src/training/13. Flows/Flow Definition Example.sysml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ package 'Flow Definition Example' {
1313
part tankAssy : FuelTankAssembly;
1414
part eng : Engine;
1515

16-
flow : FuelFlow
16+
flow : FuelFlow of Fuel
1717
from tankAssy.fuelTankPort.fuelSupply
1818
to eng.engineFuelPort.fuelSupply;
1919

0 commit comments

Comments
 (0)