Merge pull request #731 from Systems-Modeling/ST6RI-906

ST6RI-906 Evaluation of functions from TrigFunctions

Author: seidewitz

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2022-2025 Model Driven Solutions, Inc.
+ * Copyright (c) 2022-2026 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -27,7 +27,6 @@
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.Expression;
 import org.omg.sysml.lang.sysml.Feature;
-import org.omg.sysml.lang.sysml.FeatureTyping;
 import org.omg.sysml.lang.sysml.FeatureValue;
 import org.omg.sysml.lang.sysml.Function;
 import org.omg.sysml.lang.sysml.InvocationExpression;
@@ -37,6 +36,7 @@
 import org.omg.sysml.util.ElementUtil;
 import org.omg.sysml.util.EvaluationUtil;
 import org.omg.sysml.util.FeatureUtil;
+import org.omg.sysml.util.NamespaceUtil;
 import org.omg.sysml.util.TypeUtil;
 
 public class ExpressionEvaluator extends ModelLevelExpressionEvaluator {
@@ -74,13 +74,9 @@ public EList<Element> evaluateInvocation(InvocationExpression expression, Elemen
 	protected InvocationExpression instantiateInvocation(InvocationExpression expression, Element target) {
 		InvocationExpression instantiation = SysMLFactory.eINSTANCE.createInvocationExpression();
 
-		// Copy typing from original expression.
-		for (FeatureTyping typing: expression.getOwnedTyping()) {
-			FeatureTyping newTyping = SysMLFactory.eINSTANCE.createFeatureTyping();
-			newTyping.setType(typing.getType());
-			newTyping.setTypedFeature(instantiation);
-			instantiation.getOwnedRelationship().add(newTyping);
-		}
+		// Copy instantiatedType from original expression.
+		Type instantiatedType = expression.getInstantiatedType();
+		NamespaceUtil.addMemberTo(instantiation, instantiatedType);
 
 		// Add implicit generalization.
 		ElementUtil.transform(instantiation);
@@ -119,4 +115,15 @@ protected InvocationExpression instantiateInvocation(InvocationExpression expres
 
 		return instantiation;
 	}
+	
+	@Override
+	public EList<Element> evaluateFeature(Feature feature, Type type) {
+		EList<Element> results = super.evaluateFeature(feature, type);
+		Element result = results == null || results.size() != 1? null: results.get(0);
+		
+		// Treat an unbound input parameter as if it was null.
+		return type != null && result instanceof Feature && !(result instanceof Expression) &&
+			   FeatureUtil.isInputParameter((Feature)results.get(0), type)? EvaluationUtil.nullList(): results;
+	}
+	
 }

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

@@ -26,14 +26,15 @@
 import org.omg.sysml.execution.expressions.functions.numerical.*;
 import org.omg.sysml.execution.expressions.functions.sequence.*;
 import org.omg.sysml.execution.expressions.functions.string.*;
+import org.omg.sysml.execution.expressions.functions.trig.*;
 
 public class LibraryFunctionFactory extends org.omg.sysml.expressions.ModelLevelLibraryFunctionFactory {
 
 	public static final LibraryFunctionFactory INSTANCE = new LibraryFunctionFactory();
 
 	@Override
-	protected void initializeFunctionMap() {
-		super.initializeFunctionMap();
+	protected void initialize() {
+		super.initialize();
 
 		// ControlFunctions
 		put(new ExistsFunction());
@@ -75,6 +76,17 @@ protected void initializeFunctionMap() {
 		// StringFunctions
 		put(new StringLengthFunction());
 		put(new StringSubstringFunction());
+		
+		// TrigFunctions
+		put(new ACosFunction());
+		put(new AsinFunction());
+		put(new AtanFunction());
+		put(new CosFunction());
+		put(new CotFunction());
+		put(new DegFunction());
+		put(new RadFunction());
+		put(new SinFunction());
+		put(new TanFunction());
 	}
 
 }

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

@@ -21,21 +21,21 @@
 package org.omg.sysml.execution.expressions.functions.control;
 
 import org.eclipse.emf.common.util.EList;
-import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
+import org.omg.sysml.expressions.ExpressionEvaluator;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.InvocationExpression;
 import org.omg.sysml.util.EvaluationUtil;
 
 public class ExistsFunction extends ForAllFunction {
 
 	@Override
-	public String getOperatorName() {
+	public String getFunctionName() {
 		return "exists";
 	}
 
 	@Override
 	public EList<Element> invoke(InvocationExpression invocation, Element target,
-			ModelLevelExpressionEvaluator evaluator) {
+			ExpressionEvaluator evaluator) {
 		Boolean result = forAll(invocation, target, evaluator, false);
 		return result == null? EvaluationUtil.singletonList(invocation): EvaluationUtil.booleanResult(!result);
 	}

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

@@ -21,7 +21,7 @@
 package org.omg.sysml.execution.expressions.functions.control;
 
 import org.eclipse.emf.common.util.EList;
-import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
+import org.omg.sysml.expressions.ExpressionEvaluator;
 import org.omg.sysml.expressions.functions.control.ControlFunction;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.Expression;
@@ -31,12 +31,12 @@
 public class ForAllFunction extends ControlFunction {
 
 	@Override
-	public String getOperatorName() {
+	public String getFunctionName() {
 		return "forAll";
 	}
 
 	public Boolean forAll(InvocationExpression invocation, Element target,
-			ModelLevelExpressionEvaluator evaluator, Boolean test) {
+			ExpressionEvaluator evaluator, Boolean test) {
 		EList<Element> list = evaluator.evaluateArgument(invocation, 0, target);
 		Element expr = evaluator.argumentValue(invocation, 1, target);
 		if (list == null || !(expr instanceof Expression)) {
@@ -60,7 +60,7 @@ public Boolean forAll(InvocationExpression invocation, Element target,
 
 	@Override
 	public EList<Element> invoke(InvocationExpression invocation, Element target,
-			ModelLevelExpressionEvaluator evaluator) {
+			ExpressionEvaluator evaluator) {
 		Boolean result = forAll(invocation, target, evaluator, true);
 		return result == null? EvaluationUtil.singletonList(invocation): EvaluationUtil.booleanResult(result);
 	}

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

@@ -23,7 +23,7 @@
 import java.util.function.BiFunction;
 
 import org.eclipse.emf.common.util.EList;
-import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
+import org.omg.sysml.expressions.ExpressionEvaluator;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.Expression;
 import org.omg.sysml.lang.sysml.InvocationExpression;
@@ -35,13 +35,13 @@ public class MaximizeFunction extends ReduceFunction {
 	private static final String MAX_FUNCTION = "DataFunctions::max";
 
 	@Override
-	public String getOperatorName() {
+	public String getFunctionName() {
 		return "maximize";
 	}
 
 	@Override
 	public EList<Element> invoke(InvocationExpression invocation, Element target,
-			ModelLevelExpressionEvaluator evaluator) {
+			ExpressionEvaluator evaluator) {
 		EList<Element> list = evaluator.evaluateArgument(invocation, 0, target);
 		Element expr = evaluator.argumentValue(invocation, 1, target);
 		if (list == null || !(expr instanceof Expression)) {

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

@@ -23,7 +23,7 @@
 import java.util.function.BiFunction;
 
 import org.eclipse.emf.common.util.EList;
-import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
+import org.omg.sysml.expressions.ExpressionEvaluator;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.Expression;
 import org.omg.sysml.lang.sysml.InvocationExpression;
@@ -35,13 +35,13 @@ public class MinimizeFunction extends ReduceFunction {
 	private static final String MIN_FUNCTION = "DataFunctions::min";
 
 	@Override
-	public String getOperatorName() {
+	public String getFunctionName() {
 		return "minimize";
 	}
 
 	@Override
 	public EList<Element> invoke(InvocationExpression invocation, Element target,
-			ModelLevelExpressionEvaluator evaluator) {
+			ExpressionEvaluator evaluator) {
 		EList<Element> list = evaluator.evaluateArgument(invocation, 0, target);
 		Element expr = evaluator.argumentValue(invocation, 1, target);
 		if (list == null || !(expr instanceof Expression)) {

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

@@ -23,7 +23,7 @@
 import java.util.function.BiFunction;
 
 import org.eclipse.emf.common.util.EList;
-import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
+import org.omg.sysml.expressions.ExpressionEvaluator;
 import org.omg.sysml.expressions.functions.control.ControlFunction;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.Expression;
@@ -33,7 +33,7 @@
 public class ReduceFunction extends ControlFunction {
 
 	@Override
-	public String getOperatorName() {
+	public String getFunctionName() {
 		return "reduce";
 	}
 
@@ -55,7 +55,7 @@ protected EList<Element> reduce(InvocationExpression invocation, EList<Element>
 
 	@Override
 	public EList<Element> invoke(InvocationExpression invocation, Element target,
-			ModelLevelExpressionEvaluator evaluator) {
+			ExpressionEvaluator evaluator) {
 		EList<Element> list = evaluator.evaluateArgument(invocation, 0, target);
 		Element expr = evaluator.argumentValue(invocation, 1, target);
 		if (list == null || !(expr instanceof Expression)) {

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

@@ -23,7 +23,7 @@
 import java.util.function.BiFunction;
 
 import org.eclipse.emf.common.util.EList;
-import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
+import org.omg.sysml.expressions.ExpressionEvaluator;
 import org.omg.sysml.expressions.functions.control.ControlFunction;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.InvocationExpression;
@@ -32,13 +32,13 @@
 public class RejectFunction extends ControlFunction {
 
 	@Override
-	public String getOperatorName() {
+	public String getFunctionName() {
 		return "reject";
 	}
 
 	@Override
 	public EList<Element> invoke(InvocationExpression invocation, Element target,
-			ModelLevelExpressionEvaluator evaluator) {
+			ExpressionEvaluator evaluator) {
 		return collectSelected(invocation, target, evaluator, new BiFunction<>() {
 			@Override
 			public EList<Element> apply(Element value, EList<Element> exprValue) {

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

@@ -21,7 +21,7 @@
 package org.omg.sysml.execution.expressions.functions.control;
 
 import org.eclipse.emf.common.util.EList;
-import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
+import org.omg.sysml.expressions.ExpressionEvaluator;
 import org.omg.sysml.expressions.functions.control.SelectFunction;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.InvocationExpression;
@@ -30,13 +30,13 @@
 public class SelectOneFunction extends SelectFunction {
 
 	@Override
-	public String getOperatorName() {
+	public String getFunctionName() {
 		return "selectOne";
 	}
 
 	@Override
 	public EList<Element> invoke(InvocationExpression invocation, Element target,
-			ModelLevelExpressionEvaluator evaluator) {
+			ExpressionEvaluator evaluator) {
 		EList<Element> list = super.invoke(invocation, target, evaluator);
 		return list.isEmpty()? EvaluationUtil.nullList():
 			   EvaluationUtil.singletonList(list.get(0));

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

@@ -29,7 +29,7 @@
 public class MaxFunction extends ArithmeticFunction {
 
 	@Override
-	public String getOperatorName() {
+	public String getFunctionName() {
 		return "max";
 	}