Skip to content
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

Jump to bottom

361: Adds input constraints to asin and asinr functions #363

Merged
merged 1 commit into from
Mar 19, 2023
Merged

361: Adds input constraints to asin and asinr functions #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 21 additions & 3 deletions src/main/java/com/ezylang/evalex/functions/trigonometric/AsinFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,38 @@
*/
package com.ezylang.evalex.functions.trigonometric;

import static java.math.BigDecimal.ONE;
import static java.math.BigDecimal.valueOf;

import com.ezylang.evalex.EvaluationException;
import com.ezylang.evalex.Expression;
import com.ezylang.evalex.data.EvaluationValue;
import com.ezylang.evalex.functions.AbstractFunction;
import com.ezylang.evalex.functions.FunctionParameter;
import com.ezylang.evalex.parser.Token;
import java.math.BigDecimal;

/** Returns the arc-sine (in degrees). */
@FunctionParameter(name = "value")
public class AsinFunction extends AbstractFunction {

private static final BigDecimal MINUS_ONE = valueOf(-1);

@Override
public EvaluationValue evaluate(
Expression expression, Token functionToken, EvaluationValue... parameterValues) {
Expression expression, Token functionToken, EvaluationValue... parameterValues)
throws EvaluationException {

BigDecimal parameterValue = parameterValues[0].getNumberValue();

return expression.convertDoubleValue(
Math.toDegrees(Math.asin(parameterValues[0].getNumberValue().doubleValue())));
if (parameterValue.compareTo(ONE) > 0) {
throw new EvaluationException(
functionToken, "Illegal asin(x) for x > 1: x = " + parameterValue);
}
if (parameterValue.compareTo(MINUS_ONE) < 0) {
throw new EvaluationException(
functionToken, "Illegal asin(x) for x < -1: x = " + parameterValue);
}
return expression.convertDoubleValue(Math.toDegrees(Math.asin(parameterValue.doubleValue())));
}
}
21 changes: 20 additions & 1 deletion src/main/java/com/ezylang/evalex/functions/trigonometric/AsinRFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,38 @@
*/
package com.ezylang.evalex.functions.trigonometric;

import static java.math.BigDecimal.ONE;
import static java.math.BigDecimal.valueOf;

import com.ezylang.evalex.EvaluationException;
import com.ezylang.evalex.Expression;
import com.ezylang.evalex.data.EvaluationValue;
import com.ezylang.evalex.functions.AbstractFunction;
import com.ezylang.evalex.functions.FunctionParameter;
import com.ezylang.evalex.parser.Token;
import java.math.BigDecimal;

/** Returns the arc-sine (in radians). */
@FunctionParameter(name = "value")
public class AsinRFunction extends AbstractFunction {

private static final BigDecimal MINUS_ONE = valueOf(-1);

@Override
public EvaluationValue evaluate(
Expression expression, Token functionToken, EvaluationValue... parameterValues) {
Expression expression, Token functionToken, EvaluationValue... parameterValues)
throws EvaluationException {

BigDecimal parameterValue = parameterValues[0].getNumberValue();

if (parameterValue.compareTo(ONE) > 0) {
throw new EvaluationException(
functionToken, "Illegal asinr(x) for x > 1: x = " + parameterValue);
}
if (parameterValue.compareTo(MINUS_ONE) < 0) {
throw new EvaluationException(
functionToken, "Illegal asinr(x) for x < -1: x = " + parameterValue);
}
return expression.convertDoubleValue(
Math.asin(parameterValues[0].getNumberValue().doubleValue()));
}
Expand Down
28 changes: 28 additions & 0 deletions src/test/java/com/ezylang/evalex/functions/trigonometric/TrigonometricFunctionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,20 @@ void testAsin(String expression, String expectedResult)
assertExpressionHasExpectedResult(expression, expectedResult);
}

@Test
void testAsinThrowsExceptionPositive() {
assertThatThrownBy(() -> new Expression("ASIN(1.5)").evaluate())
.isInstanceOf(EvaluationException.class)
.hasMessage("Illegal asin(x) for x > 1: x = 1.5");
}

@Test
void testAsinThrowsExceptionNegative() {
assertThatThrownBy(() -> new Expression("ASIN(-1.5)").evaluate())
.isInstanceOf(EvaluationException.class)
.hasMessage("Illegal asin(x) for x < -1: x = -1.5");
}

@ParameterizedTest
@CsvSource(
delimiter = ':',
Expand All @@ -161,6 +175,20 @@ void testAsinR(String expression, String expectedResult)
assertExpressionHasExpectedResult(expression, expectedResult);
}

@Test
void testAsinRThrowsExceptionPositive() {
assertThatThrownBy(() -> new Expression("ASINR(1.5)").evaluate())
.isInstanceOf(EvaluationException.class)
.hasMessage("Illegal asinr(x) for x > 1: x = 1.5");
}

@Test
void testAsinRThrowsExceptionNegative() {
assertThatThrownBy(() -> new Expression("ASINR(-1.5)").evaluate())
.isInstanceOf(EvaluationException.class)
.hasMessage("Illegal asinr(x) for x < -1: x = -1.5");
}

@ParameterizedTest
@CsvSource(
delimiter = ':',
Expand Down