Skip to content

ST6RI-874 Features subset each other in Transfers and Flows library models (KERML11-78, SYSML21-324) #682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 1, 2025
Merged

ST6RI-874 Features subset each other in Transfers and Flows library models (KERML11-78, SYSML21-324) #682

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
40fde7a
ST6RI-874 Corrected check for validateConnectorBinarySpecialization.
seidewitz Jul 30, 2025
6096547
SYSML21-324 Removed end features from Message and messages.
seidewitz Jul 30, 2025
214ef7a
ST6RI-874 Corrected example, training and validation models.
seidewitz Jul 30, 2025
ecc7cfd
ST6RI-874 Updated model library index.
seidewitz Jul 30, 2025
3a5b4e9
ST6RI-874 Corrected ElementUtil::transformAll.
seidewitz Jul 30, 2025
6fe9d37
KERML11-78 Made Transfers::transfers and messageTransfers into steps.
seidewitz Jul 31, 2025
96d80ef
SYSML21-324 Used keyword "flow" in flows and successionFlows decls.
seidewitz Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ class KerMLValidator extends AbstractKerMLValidator {
}

// validateConnectorBinarySpecialization
val connectorEnds = TypeUtil.getAllEndFeaturesOf(c)
val connectorEnds = c.connectorEnd
if (connectorEnds.size() > 2) {
val binaryLinkType = SysMLLibraryUtil.getLibraryElement(c, "Links::BinaryLink") as Type
if (c.conformsTo(binaryLinkType)) {
Expand Down
6 changes: 0 additions & 6 deletions org.omg.sysml.xpect.tests/library.systems/Flows.sysml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ standard library package Flows {
* a transfer of objects or values between two occurrences. It is
* the base type of all FlowUsages.
*/

end occurrence source: Occurrence :>> Transfer::source;
end occurrence target: Occurrence :>> Transfer::target;

ref payload :>> MessageAction::payload, Transfer::payload;

Expand Down Expand Up @@ -104,9 +101,6 @@ standard library package Flows {
/*
* messages is the base feature of all FlowUsages.
*/

end occurrence source: Occurrence :>> Message::source, transfers::source;
end occurrence target: Occurrence :>> Message::target, transfers::target;
}

abstract message flows: Flow[0..*] nonunique :> messages, flowTransfers {
Expand Down
1 change: 1 addition & 0 deletions org.omg.sysml/src/org/omg/sysml/util/ElementUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ public static void transformAll(Element root, boolean addImplicitElements) {
}
}
if (addImplicitElements && root instanceof Type) {
root.setIsImpliedIncluded(true);
TypeUtil.insertImplicitBindingConnectors((Type)root);
TypeUtil.insertImplicitSpecializations((Type)root);
if (root instanceof Feature) {
Expand Down
238 changes: 1 addition & 237 deletions sysml.library/.index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26058,65 +26058,6 @@
"self",
"that"
],
"Flows::Message::source": [
"differencesOf",
"dispatchScope",
"endShot",
"immediatePredecessors",
"immediateSuccessors",
"incomingTransferSort",
"incomingTransfers",
"incomingTransfersToSelf",
"innerSpaceDimension",
"innerSpaceOccurrences",
"intersectionsOf",
"isClosed",
"isDispatch",
"isRunToCompletion",
"justOutsideOfOccurrences",
"localClock",
"matingOccurrences",
"middleTimeSlice",
"outerSpaceDimension",
"outgoingTransfers",
"outgoingTransfersFromSelf",
"outsideOfOccurrences",
"portionOf",
"portionOfLife",
"portions",
"predecessors",
"runToCompletionScope",
"sameLifeOccurrences",
"self",
"snapshotOf",
"snapshots",
"sourceOutput",
"spaceBoundary",
"spaceBoundaryOf",
"spaceEnclosedOccurrences",
"spaceInterior",
"spaceInteriorOf",
"spaceShotOf",
"spaceShots",
"spaceSliceOf",
"spaceSlices",
"spaceTimeCoincidentOccurrences",
"spaceTimeEnclosedOccurrences",
"spaceTimeEnclosedPoints",
"startShot",
"suboccurrences",
"successors",
"superoccurrence",
"surroundedByOccurrences",
"that",
"this",
"timeCoincidentOccurrences",
"timeEnclosedOccurrences",
"timeSliceOf",
"timeSlices",
"unionsOf",
"withoutOccurrences"
],
"Flows::Message::sourceEvent": [
"differencesOf",
"dispatchScope",
Expand Down Expand Up @@ -26177,65 +26118,6 @@
"unionsOf",
"withoutOccurrences"
],
"Flows::Message::target": [
"differencesOf",
"dispatchScope",
"endShot",
"immediatePredecessors",
"immediateSuccessors",
"incomingTransferSort",
"incomingTransfers",
"incomingTransfersToSelf",
"innerSpaceDimension",
"innerSpaceOccurrences",
"intersectionsOf",
"isClosed",
"isDispatch",
"isRunToCompletion",
"justOutsideOfOccurrences",
"localClock",
"matingOccurrences",
"middleTimeSlice",
"outerSpaceDimension",
"outgoingTransfers",
"outgoingTransfersFromSelf",
"outsideOfOccurrences",
"portionOf",
"portionOfLife",
"portions",
"predecessors",
"runToCompletionScope",
"sameLifeOccurrences",
"self",
"snapshotOf",
"snapshots",
"spaceBoundary",
"spaceBoundaryOf",
"spaceEnclosedOccurrences",
"spaceInterior",
"spaceInteriorOf",
"spaceShotOf",
"spaceShots",
"spaceSliceOf",
"spaceSlices",
"spaceTimeCoincidentOccurrences",
"spaceTimeEnclosedOccurrences",
"spaceTimeEnclosedPoints",
"startShot",
"suboccurrences",
"successors",
"superoccurrence",
"surroundedByOccurrences",
"targetInput",
"that",
"this",
"timeCoincidentOccurrences",
"timeEnclosedOccurrences",
"timeSliceOf",
"timeSlices",
"unionsOf",
"withoutOccurrences"
],
"Flows::Message::targetEvent": [
"differencesOf",
"dispatchScope",
Expand Down Expand Up @@ -27076,124 +26958,6 @@
"whileLoops",
"withoutOccurrences"
],
"Flows::messages::source": [
"differencesOf",
"dispatchScope",
"endShot",
"immediatePredecessors",
"immediateSuccessors",
"incomingTransferSort",
"incomingTransfers",
"incomingTransfersToSelf",
"innerSpaceDimension",
"innerSpaceOccurrences",
"intersectionsOf",
"isClosed",
"isDispatch",
"isRunToCompletion",
"justOutsideOfOccurrences",
"localClock",
"matingOccurrences",
"middleTimeSlice",
"outerSpaceDimension",
"outgoingTransfers",
"outgoingTransfersFromSelf",
"outsideOfOccurrences",
"portionOf",
"portionOfLife",
"portions",
"predecessors",
"runToCompletionScope",
"sameLifeOccurrences",
"self",
"snapshotOf",
"snapshots",
"sourceOutput",
"spaceBoundary",
"spaceBoundaryOf",
"spaceEnclosedOccurrences",
"spaceInterior",
"spaceInteriorOf",
"spaceShotOf",
"spaceShots",
"spaceSliceOf",
"spaceSlices",
"spaceTimeCoincidentOccurrences",
"spaceTimeEnclosedOccurrences",
"spaceTimeEnclosedPoints",
"startShot",
"suboccurrences",
"successors",
"superoccurrence",
"surroundedByOccurrences",
"that",
"this",
"timeCoincidentOccurrences",
"timeEnclosedOccurrences",
"timeSliceOf",
"timeSlices",
"unionsOf",
"withoutOccurrences"
],
"Flows::messages::target": [
"differencesOf",
"dispatchScope",
"endShot",
"immediatePredecessors",
"immediateSuccessors",
"incomingTransferSort",
"incomingTransfers",
"incomingTransfersToSelf",
"innerSpaceDimension",
"innerSpaceOccurrences",
"intersectionsOf",
"isClosed",
"isDispatch",
"isRunToCompletion",
"justOutsideOfOccurrences",
"localClock",
"matingOccurrences",
"middleTimeSlice",
"outerSpaceDimension",
"outgoingTransfers",
"outgoingTransfersFromSelf",
"outsideOfOccurrences",
"portionOf",
"portionOfLife",
"portions",
"predecessors",
"runToCompletionScope",
"sameLifeOccurrences",
"self",
"snapshotOf",
"snapshots",
"spaceBoundary",
"spaceBoundaryOf",
"spaceEnclosedOccurrences",
"spaceInterior",
"spaceInteriorOf",
"spaceShotOf",
"spaceShots",
"spaceSliceOf",
"spaceSlices",
"spaceTimeCoincidentOccurrences",
"spaceTimeEnclosedOccurrences",
"spaceTimeEnclosedPoints",
"startShot",
"suboccurrences",
"successors",
"superoccurrence",
"surroundedByOccurrences",
"targetInput",
"that",
"this",
"timeCoincidentOccurrences",
"timeEnclosedOccurrences",
"timeSliceOf",
"timeSlices",
"unionsOf",
"withoutOccurrences"
],
"Flows::successionFlows": [
"acceptSubactions",
"assignments",
Expand Down Expand Up @@ -280428,5 +280192,5 @@
"withoutOccurrences"
]
},
"checksum": "e56308bc20fa25b8f302b12be002d20a1336a73c9093d123dcb1db65aec5f735"
"checksum": "198f226294739ff02b92fa966289c3c9cc666b7acded20f1d6559ca38cc87281"
}
6 changes: 0 additions & 6 deletions sysml.library/Systems Library/Flows.sysml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ standard library package Flows {
* a transfer of objects or values between two occurrences. It is
* the base type of all FlowUsages.
*/

end occurrence source: Occurrence :>> Transfer::source;
end occurrence target: Occurrence :>> Transfer::target;

ref payload :>> MessageAction::payload, Transfer::payload;

Expand Down Expand Up @@ -104,9 +101,6 @@ standard library package Flows {
/*
* messages is the base feature of all FlowUsages.
*/

end occurrence source: Occurrence :>> Message::source, transfers::source;
end occurrence target: Occurrence :>> Message::target, transfers::target;
}

abstract message flows: Flow[0..*] nonunique :> messages, flowTransfers {
Expand Down
8 changes: 4 additions & 4 deletions sysml/src/examples/Vehicle Example/SysML v2 Spec Annex A SimpleVehicleModel.sysml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ package SimpleVehicleModel{
}
part redefines speedSensor{
port redefines speedSensorPort{
event sendSensedSpeed.source;
event sendSensedSpeed.sourceEvent;
}
}
part redefines vehicleSoftware{
Expand All @@ -838,17 +838,17 @@ package SimpleVehicleModel{
}
port redefines speedSensorPort{
event occurrence setSpeedReceived=setSpeedPort.setSpeedReceived;
then event sendSensedSpeed.target;
then event sendSensedSpeed.targetEvent;
}
port redefines cruiseControlPort{
event sendFuelCmd.source;
event sendFuelCmd.sourceEvent;
}
}
}
}
part redefines engine{
port redefines fuelCmdPort{
event sendFuelCmd.target;
event sendFuelCmd.targetEvent;
}
}
message sendSensedSpeed of SensedSpeed;
Expand Down
4 changes: 2 additions & 2 deletions sysml/src/training/41. Language Extension/User Keyword Example.sysml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ package 'User Keyword Example' {
:>> probability = 0.01;
}

#causation first 'battery old' then 'power low';
#causation connect 'battery old' to 'power low';

#situation 'power low' {
constraint { device.battery.power < minPower }
}

#causation first 'power low' then 'device shutoff';
#causation connect 'power low' to 'device shutoff';

#failure 'device shutoff' {
:>> severity = LevelEnum::high;
Expand Down
8 changes: 4 additions & 4 deletions sysml/src/validation/14-Language Extensions/14c-Language Extensions.sysml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ package '14c-Language-Extensions' {
}

metadata def <causation> CausationMetadata :> SemanticMetadata {
:>> annotatedElement : SysML::SuccessionAsUsage;
:>> annotatedElement : SysML::ConnectionUsage;
:>> baseType = causations meta SysML::Usage;
}

Expand Down Expand Up @@ -166,17 +166,17 @@ package '14c-Language-Extensions' {
:>> occurs = 0.005;
}

#causation first 'battery depleted' then 'battery cannot be charged';
#causation connect 'battery depleted' to 'battery cannot be charged';

#failure occurrence 'battery cannot be charged' {
:>> detected = 0.013;
}

#causation first 'battery cannot be charged' then 'glucose level undetected';
#causation connect 'battery cannot be charged' to 'glucose level undetected';

#effect occurrence 'glucose level undetected';

#causation first 'glucose level undetected' then 'therapy delay';
#causation connect 'glucose level undetected' to 'therapy delay';

#effect occurrence 'therapy delay' {
:>> severity = "High";
Expand Down
Loading