Skip to content

Commit 27021d1

Browse files
committed
ST6RI-906 Implemented evaluation of references to TrigFunctions::pi.
- Added general mechanism for model-level evaluation of library features. - Renamed some of the methods of interface LibraryFunction.
1 parent c240715 commit 27021d1

85 files changed

Lines changed: 209 additions & 90 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/LibraryFunctionFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public class LibraryFunctionFactory extends org.omg.sysml.expressions.ModelLevel
3333
public static final LibraryFunctionFactory INSTANCE = new LibraryFunctionFactory();
3434

3535
@Override
36-
protected void initializeFunctionMap() {
37-
super.initializeFunctionMap();
36+
protected void initialize() {
37+
super.initialize();
3838

3939
// ControlFunctions
4040
put(new ExistsFunction());

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/ExistsFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public class ExistsFunction extends ForAllFunction {
3030

3131
@Override
32-
public String getOperatorName() {
32+
public String getFunctionName() {
3333
return "exists";
3434
}
3535

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/ForAllFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
public class ForAllFunction extends ControlFunction {
3232

3333
@Override
34-
public String getOperatorName() {
34+
public String getFunctionName() {
3535
return "forAll";
3636
}
3737

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/MaximizeFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class MaximizeFunction extends ReduceFunction {
3535
private static final String MAX_FUNCTION = "DataFunctions::max";
3636

3737
@Override
38-
public String getOperatorName() {
38+
public String getFunctionName() {
3939
return "maximize";
4040
}
4141

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/MinimizeFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class MinimizeFunction extends ReduceFunction {
3535
private static final String MIN_FUNCTION = "DataFunctions::min";
3636

3737
@Override
38-
public String getOperatorName() {
38+
public String getFunctionName() {
3939
return "minimize";
4040
}
4141

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/ReduceFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
public class ReduceFunction extends ControlFunction {
3434

3535
@Override
36-
public String getOperatorName() {
36+
public String getFunctionName() {
3737
return "reduce";
3838
}
3939

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/RejectFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
public class RejectFunction extends ControlFunction {
3333

3434
@Override
35-
public String getOperatorName() {
35+
public String getFunctionName() {
3636
return "reject";
3737
}
3838

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/SelectOneFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
public class SelectOneFunction extends SelectFunction {
3131

3232
@Override
33-
public String getOperatorName() {
33+
public String getFunctionName() {
3434
return "selectOne";
3535
}
3636

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/data/MaxFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public class MaxFunction extends ArithmeticFunction {
3030

3131
@Override
32-
public String getOperatorName() {
32+
public String getFunctionName() {
3333
return "max";
3434
}
3535

org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/data/MinFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public class MinFunction extends ArithmeticFunction {
3030

3131
@Override
32-
public String getOperatorName() {
32+
public String getFunctionName() {
3333
return "min";
3434
}
3535

0 commit comments

Comments
 (0)