Skip to content

Commit a855107

Browse files
seidewitzseidewitz
authored
Merge pull request #630 from Systems-Modeling/ST6RI-832
ST6RI-832 Domain library models (SYSML2_-32/248)
2 parents 0a2f89c + 7d49a5a commit a855107

5 files changed

Lines changed: 23 additions & 33 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ standard library package TradeStudies {
5858
*/
5959
}
6060

61-
in calc fn : EvaluationFunction {
61+
in calc eval : EvaluationFunction {
6262
doc
6363
/*
6464
* The EvaluationFunction to be used in evaluating the given alternatives.
@@ -74,7 +74,7 @@ standard library package TradeStudies {
7474
*/
7575
}
7676

77-
require constraint { fn(selectedAlternative) == best }
77+
require constraint { eval(selectedAlternative) == best }
7878
}
7979

8080
requirement def MinimizeObjective :> TradeStudyObjective {
@@ -87,7 +87,7 @@ standard library package TradeStudies {
8787

8888
subject :>> selectedAlternative;
8989
in ref :>> alternatives;
90-
in calc :>>fn;
90+
in calc :>> eval;
9191

9292
out attribute :>> best = alternatives->minimize {
9393
doc
@@ -109,7 +109,7 @@ standard library package TradeStudies {
109109

110110
subject :>> selectedAlternative;
111111
in ref :>> alternatives;
112-
in calc :>>fn;
112+
in calc :>> eval;
113113

114114
out attribute :>> best = alternatives->maximize {
115115
doc
@@ -164,7 +164,7 @@ standard library package TradeStudies {
164164

165165
subject :>> selectedAlternative;
166166
in ref :>> alternatives = studyAlternatives;
167-
in calc :>> fn = evaluationFunction;
167+
in calc :>> eval = evaluationFunction;
168168
}
169169

170170
return selectedAlternative : Anything = studyAlternatives->selectOne {in ref a {

‎org.omg.sysml.xpect.tests/library.domain/Quantities and Units/Time.sysml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,6 @@ standard library package Time {
195195
* 1969-07-20T20:17:00Z (UTC date and time with second precision)
196196
* 1969-07-20T15:17:00-05:00 (local date and time with second precision for a timezone 5 hour behind UTC)
197197
* 1969-07-20T22:17:00+02:00 (local date and time with second precision for a timezone 2 hour ahead of UTC)
198-
*
199-
* TODO: Add constraint to verify ISO 8691 extended string encoding.
200198
*/
201199
}
202200

@@ -222,9 +220,6 @@ standard library package Time {
222220
/*
223221
* Representation of an ISO 8601 date and time with explicit date and time component attributes
224222
*
225-
* TO DO: Specify restrictions for attributes month (1 to 12), day (1 to 31), hour (0 to 23), minute (0 to 59), second (0 to 60),
226-
* microsecond (0 to 999999), hourOffset (-12 to +12), minuteOffset (-59 to +59)
227-
*
228223
* The total time offset is equal to the summation of hourOffset and minuteOffset.
229224
*/
230225

‎sysml.library/.index.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -253491,7 +253491,7 @@
253491253491
"dispatchScope",
253492253492
"enclosedPerformances",
253493253493
"endShot",
253494-
"fn",
253494+
"eval",
253495253495
"immediatePredecessors",
253496253496
"immediateSuccessors",
253497253497
"incomingTransferSort",
@@ -253561,7 +253561,7 @@
253561253561
"self",
253562253562
"that"
253563253563
],
253564-
"TradeStudies::MaximizeObjective::fn": [
253564+
"TradeStudies::MaximizeObjective::eval": [
253565253565
"acceptSubactions",
253566253566
"alternative",
253567253567
"assignments",
@@ -253645,7 +253645,7 @@
253645253645
"whileLoops",
253646253646
"withoutOccurrences"
253647253647
],
253648-
"TradeStudies::MaximizeObjective::fn::result": [
253648+
"TradeStudies::MaximizeObjective::eval::result": [
253649253649
"self",
253650253650
"that"
253651253651
],
@@ -253668,7 +253668,7 @@
253668253668
"dispatchScope",
253669253669
"enclosedPerformances",
253670253670
"endShot",
253671-
"fn",
253671+
"eval",
253672253672
"immediatePredecessors",
253673253673
"immediateSuccessors",
253674253674
"incomingTransferSort",
@@ -253738,7 +253738,7 @@
253738253738
"self",
253739253739
"that"
253740253740
],
253741-
"TradeStudies::MinimizeObjective::fn": [
253741+
"TradeStudies::MinimizeObjective::eval": [
253742253742
"acceptSubactions",
253743253743
"alternative",
253744253744
"assignments",
@@ -253822,7 +253822,7 @@
253822253822
"whileLoops",
253823253823
"withoutOccurrences"
253824253824
],
253825-
"TradeStudies::MinimizeObjective::fn::result": [
253825+
"TradeStudies::MinimizeObjective::eval::result": [
253826253826
"self",
253827253827
"that"
253828253828
],
@@ -254027,7 +254027,7 @@
254027254027
"dispatchScope",
254028254028
"enclosedPerformances",
254029254029
"endShot",
254030-
"fn",
254030+
"eval",
254031254031
"immediatePredecessors",
254032254032
"immediateSuccessors",
254033254033
"incomingTransferSort",
@@ -254097,7 +254097,7 @@
254097254097
"self",
254098254098
"that"
254099254099
],
254100-
"TradeStudies::TradeStudy::tradeStudyObjective::fn": [
254100+
"TradeStudies::TradeStudy::tradeStudyObjective::eval": [
254101254101
"acceptSubactions",
254102254102
"alternative",
254103254103
"assignments",
@@ -254181,7 +254181,7 @@
254181254181
"whileLoops",
254182254182
"withoutOccurrences"
254183254183
],
254184-
"TradeStudies::TradeStudy::tradeStudyObjective::fn::result": [
254184+
"TradeStudies::TradeStudy::tradeStudyObjective::eval::result": [
254185254185
"self",
254186254186
"that"
254187254187
],
@@ -254204,7 +254204,7 @@
254204254204
"dispatchScope",
254205254205
"enclosedPerformances",
254206254206
"endShot",
254207-
"fn",
254207+
"eval",
254208254208
"immediatePredecessors",
254209254209
"immediateSuccessors",
254210254210
"incomingTransferSort",
@@ -254274,7 +254274,7 @@
254274254274
"self",
254275254275
"that"
254276254276
],
254277-
"TradeStudies::TradeStudyObjective::fn": [
254277+
"TradeStudies::TradeStudyObjective::eval": [
254278254278
"acceptSubactions",
254279254279
"alternative",
254280254280
"assignments",
@@ -254358,7 +254358,7 @@
254358254358
"whileLoops",
254359254359
"withoutOccurrences"
254360254360
],
254361-
"TradeStudies::TradeStudyObjective::fn::result": [
254361+
"TradeStudies::TradeStudyObjective::eval::result": [
254362254362
"self",
254363254363
"that"
254364254364
],
@@ -279134,5 +279134,5 @@
279134279134
"withoutOccurrences"
279135279135
]
279136279136
},
279137-
"checksum": "534e9272aa15496df81cce80ed30d9a8b990e7dbd051cb8fb62b3b831c27c769"
279137+
"checksum": "763fd11aeb10bee7b96e467e33a92f42b1c45bbb6589f39790546592075d8be7"
279138279138
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ standard library package TradeStudies {
5858
*/
5959
}
6060

61-
in calc fn : EvaluationFunction {
61+
in calc eval : EvaluationFunction {
6262
doc
6363
/*
6464
* The EvaluationFunction to be used in evaluating the given alternatives.
@@ -74,7 +74,7 @@ standard library package TradeStudies {
7474
*/
7575
}
7676

77-
require constraint { fn(selectedAlternative) == best }
77+
require constraint { eval(selectedAlternative) == best }
7878
}
7979

8080
requirement def MinimizeObjective :> TradeStudyObjective {
@@ -87,7 +87,7 @@ standard library package TradeStudies {
8787

8888
subject :>> selectedAlternative;
8989
in ref :>> alternatives;
90-
in calc :>>fn;
90+
in calc :>> eval;
9191

9292
out attribute :>> best = alternatives->minimize {
9393
doc
@@ -109,7 +109,7 @@ standard library package TradeStudies {
109109

110110
subject :>> selectedAlternative;
111111
in ref :>> alternatives;
112-
in calc :>>fn;
112+
in calc :>> eval;
113113

114114
out attribute :>> best = alternatives->maximize {
115115
doc
@@ -164,7 +164,7 @@ standard library package TradeStudies {
164164

165165
subject :>> selectedAlternative;
166166
in ref :>> alternatives = studyAlternatives;
167-
in calc :>> fn = evaluationFunction;
167+
in calc :>> eval = evaluationFunction;
168168
}
169169

170170
return selectedAlternative : Anything = studyAlternatives->selectOne {in ref a {

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,6 @@ standard library package Time {
195195
* 1969-07-20T20:17:00Z (UTC date and time with second precision)
196196
* 1969-07-20T15:17:00-05:00 (local date and time with second precision for a timezone 5 hour behind UTC)
197197
* 1969-07-20T22:17:00+02:00 (local date and time with second precision for a timezone 2 hour ahead of UTC)
198-
*
199-
* TODO: Add constraint to verify ISO 8691 extended string encoding.
200198
*/
201199
}
202200

@@ -222,9 +220,6 @@ standard library package Time {
222220
/*
223221
* Representation of an ISO 8601 date and time with explicit date and time component attributes
224222
*
225-
* TO DO: Specify restrictions for attributes month (1 to 12), day (1 to 31), hour (0 to 23), minute (0 to 59), second (0 to 60),
226-
* microsecond (0 to 999999), hourOffset (-12 to +12), minuteOffset (-59 to +59)
227-
*
228223
* The total time offset is equal to the summation of hourOffset and minuteOffset.
229224
*/
230225

0 commit comments

Comments
 (0)