Skip to content

Commit a1e24a1

Browse files
seidewitzseidewitz
authored
Merge pull request #676 from Systems-Modeling/ST6RI-869
ST6RI-869 Diamond inheritance problem in TradeStudy model
2 parents 2e7a85a + b44de24 commit a1e24a1

3 files changed

Lines changed: 7 additions & 199 deletions

File tree

‎org.omg.sysml.xpect.tests/library.domain/Analysis/TradeStudies.sysml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ standard library package TradeStudies {
6565
*/
6666
}
6767

68-
out attribute best : ScalarValue {
68+
attribute best : ScalarValue {
6969
doc
7070
/*
7171
* Out of the evaluation results of all the given alternatives, the one that is considered
@@ -85,11 +85,7 @@ standard library package TradeStudies {
8585
* given alternatives.
8686
*/
8787

88-
subject :>> selectedAlternative;
89-
in ref :>> alternatives;
90-
in calc :>> eval;
91-
92-
out attribute :>> best = alternatives->minimize {
88+
attribute :>> best = alternatives->minimize {
9389
doc
9490
/*
9591
* For a MinimizeObjective, the best value is the minimum one.
@@ -107,11 +103,7 @@ standard library package TradeStudies {
107103
* given alternatives.
108104
*/
109105

110-
subject :>> selectedAlternative;
111-
in ref :>> alternatives;
112-
in calc :>> eval;
113-
114-
out attribute :>> best = alternatives->maximize {
106+
attribute :>> best = alternatives->maximize {
115107
doc
116108
/*
117109
* For a MinimizeObjective, the best value is the maximum one.

‎sysml.library/.index.json‎

Lines changed: 1 addition & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -252285,98 +252285,10 @@
252285252285
"unionsOf",
252286252286
"withoutOccurrences"
252287252287
],
252288-
"TradeStudies::MaximizeObjective::alternatives": [
252289-
"self",
252290-
"that"
252291-
],
252292252288
"TradeStudies::MaximizeObjective::best": [
252293252289
"self",
252294252290
"that"
252295252291
],
252296-
"TradeStudies::MaximizeObjective::eval": [
252297-
"acceptSubactions",
252298-
"alternative",
252299-
"assignments",
252300-
"controls",
252301-
"decisionTransitions",
252302-
"decisions",
252303-
"differencesOf",
252304-
"dispatchScope",
252305-
"done",
252306-
"enclosedPerformances",
252307-
"forLoops",
252308-
"forks",
252309-
"ifSubactions",
252310-
"immediatePredecessors",
252311-
"immediateSuccessors",
252312-
"incomingTransferSort",
252313-
"incomingTransfers",
252314-
"incomingTransfersToSelf",
252315-
"innerSpaceDimension",
252316-
"innerSpaceOccurrences",
252317-
"intersectionsOf",
252318-
"involvedObjects",
252319-
"isClosed",
252320-
"isDispatch",
252321-
"isRunToCompletion",
252322-
"joins",
252323-
"justOutsideOfOccurrences",
252324-
"localClock",
252325-
"longerOccurrence",
252326-
"loops",
252327-
"matingOccurrences",
252328-
"merges",
252329-
"middleTimeSlice",
252330-
"outerSpaceDimension",
252331-
"outgoingTransfers",
252332-
"outgoingTransfersFromSelf",
252333-
"outsideOfOccurrences",
252334-
"performers",
252335-
"portionOf",
252336-
"portionOfLife",
252337-
"portions",
252338-
"predecessors",
252339-
"result",
252340-
"runToCompletionScope",
252341-
"sameLifeOccurrences",
252342-
"self",
252343-
"sendSubactions",
252344-
"shorterOccurrence",
252345-
"snapshotOf",
252346-
"snapshots",
252347-
"spaceBoundary",
252348-
"spaceBoundaryOf",
252349-
"spaceEnclosedOccurrences",
252350-
"spaceInterior",
252351-
"spaceInteriorOf",
252352-
"spaceShotOf",
252353-
"spaceShots",
252354-
"spaceSliceOf",
252355-
"spaceSlices",
252356-
"spaceTimeCoincidentOccurrences",
252357-
"spaceTimeEnclosedOccurrences",
252358-
"spaceTimeEnclosedPoints",
252359-
"start",
252360-
"subactions",
252361-
"subcalculations",
252362-
"suboccurrences",
252363-
"subperformances",
252364-
"successors",
252365-
"superoccurrence",
252366-
"surroundedByOccurrences",
252367-
"terminateSubactions",
252368-
"that",
252369-
"this",
252370-
"thisPerformance",
252371-
"timeCoincidentOccurrences",
252372-
"timeEnclosedOccurrences",
252373-
"timeSliceOf",
252374-
"timeSlices",
252375-
"transitions",
252376-
"unionsOf",
252377-
"whileLoops",
252378-
"withoutOccurrences"
252379-
],
252380252292
"TradeStudies::MaximizeObjective::selectedAlternative": [
252381252293
"self",
252382252294
"that"
@@ -252454,98 +252366,10 @@
252454252366
"unionsOf",
252455252367
"withoutOccurrences"
252456252368
],
252457-
"TradeStudies::MinimizeObjective::alternatives": [
252458-
"self",
252459-
"that"
252460-
],
252461252369
"TradeStudies::MinimizeObjective::best": [
252462252370
"self",
252463252371
"that"
252464252372
],
252465-
"TradeStudies::MinimizeObjective::eval": [
252466-
"acceptSubactions",
252467-
"alternative",
252468-
"assignments",
252469-
"controls",
252470-
"decisionTransitions",
252471-
"decisions",
252472-
"differencesOf",
252473-
"dispatchScope",
252474-
"done",
252475-
"enclosedPerformances",
252476-
"forLoops",
252477-
"forks",
252478-
"ifSubactions",
252479-
"immediatePredecessors",
252480-
"immediateSuccessors",
252481-
"incomingTransferSort",
252482-
"incomingTransfers",
252483-
"incomingTransfersToSelf",
252484-
"innerSpaceDimension",
252485-
"innerSpaceOccurrences",
252486-
"intersectionsOf",
252487-
"involvedObjects",
252488-
"isClosed",
252489-
"isDispatch",
252490-
"isRunToCompletion",
252491-
"joins",
252492-
"justOutsideOfOccurrences",
252493-
"localClock",
252494-
"longerOccurrence",
252495-
"loops",
252496-
"matingOccurrences",
252497-
"merges",
252498-
"middleTimeSlice",
252499-
"outerSpaceDimension",
252500-
"outgoingTransfers",
252501-
"outgoingTransfersFromSelf",
252502-
"outsideOfOccurrences",
252503-
"performers",
252504-
"portionOf",
252505-
"portionOfLife",
252506-
"portions",
252507-
"predecessors",
252508-
"result",
252509-
"runToCompletionScope",
252510-
"sameLifeOccurrences",
252511-
"self",
252512-
"sendSubactions",
252513-
"shorterOccurrence",
252514-
"snapshotOf",
252515-
"snapshots",
252516-
"spaceBoundary",
252517-
"spaceBoundaryOf",
252518-
"spaceEnclosedOccurrences",
252519-
"spaceInterior",
252520-
"spaceInteriorOf",
252521-
"spaceShotOf",
252522-
"spaceShots",
252523-
"spaceSliceOf",
252524-
"spaceSlices",
252525-
"spaceTimeCoincidentOccurrences",
252526-
"spaceTimeEnclosedOccurrences",
252527-
"spaceTimeEnclosedPoints",
252528-
"start",
252529-
"subactions",
252530-
"subcalculations",
252531-
"suboccurrences",
252532-
"subperformances",
252533-
"successors",
252534-
"superoccurrence",
252535-
"surroundedByOccurrences",
252536-
"terminateSubactions",
252537-
"that",
252538-
"this",
252539-
"thisPerformance",
252540-
"timeCoincidentOccurrences",
252541-
"timeEnclosedOccurrences",
252542-
"timeSliceOf",
252543-
"timeSlices",
252544-
"transitions",
252545-
"unionsOf",
252546-
"whileLoops",
252547-
"withoutOccurrences"
252548-
],
252549252373
"TradeStudies::MinimizeObjective::selectedAlternative": [
252550252374
"self",
252551252375
"that"
@@ -277390,5 +277214,5 @@
277390277214
"withoutOccurrences"
277391277215
]
277392277216
},
277393-
"checksum": "bbaf25f8e42333248a189b5ab45da994b8df1814c02d94eb50d048e8452333bc"
277217+
"checksum": "718bfd71d1c527c11db27439af53cea8b6149a762186f92bc1e4bade61a9b28d"
277394277218
}

‎sysml.library/Domain Libraries/Analysis/TradeStudies.sysml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ standard library package TradeStudies {
6565
*/
6666
}
6767

68-
out attribute best : ScalarValue {
68+
attribute best : ScalarValue {
6969
doc
7070
/*
7171
* Out of the evaluation results of all the given alternatives, the one that is considered
@@ -85,11 +85,7 @@ standard library package TradeStudies {
8585
* given alternatives.
8686
*/
8787

88-
subject :>> selectedAlternative;
89-
in ref :>> alternatives;
90-
in calc :>> eval;
91-
92-
out attribute :>> best = alternatives->minimize {
88+
attribute :>> best = alternatives->minimize {
9389
doc
9490
/*
9591
* For a MinimizeObjective, the best value is the minimum one.
@@ -107,11 +103,7 @@ standard library package TradeStudies {
107103
* given alternatives.
108104
*/
109105

110-
subject :>> selectedAlternative;
111-
in ref :>> alternatives;
112-
in calc :>> eval;
113-
114-
out attribute :>> best = alternatives->maximize {
106+
attribute :>> best = alternatives->maximize {
115107
doc
116108
/*
117109
* For a MinimizeObjective, the best value is the maximum one.

0 commit comments

Comments
 (0)