Small improvements to the formula parser

A-Herzog · Jul 18, 2020 · 682ad4a · 682ad4a
1 parent 804a66d
commit 682ad4a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/SimSystem/src/main/java/parser/symbols/CalcSymbolPreOperatorCos.java b/SimSystem/src/main/java/parser/symbols/CalcSymbolPreOperatorCos.java
@@ -26,13 +26,15 @@ public final class CalcSymbolPreOperatorCos extends CalcSymbolPreOperator {
 	@Override
 	protected double calc(double[] parameters) throws MathCalcError {
 		if (parameters.length!=1) throw error();
-		return Math.cos(parameters[0]);
+		final double d=Math.cos(parameters[0]);
+		return (Math.abs(d)<2E-16)?0.0:d;
 	}
 
 	@Override
 	protected double calcOrDefault(final double[] parameters, final double fallbackValue) {
 		if (parameters.length!=1) return fallbackValue;
-		return Math.cos(parameters[0]);
+		final double d=Math.cos(parameters[0]);
+		return (Math.abs(d)<2E-16)?0.0:d;
 	}
 
 	@Override

diff --git a/SimSystem/src/main/java/parser/symbols/CalcSymbolPreOperatorSin.java b/SimSystem/src/main/java/parser/symbols/CalcSymbolPreOperatorSin.java
@@ -26,13 +26,15 @@ public final class CalcSymbolPreOperatorSin extends CalcSymbolPreOperator {
 	@Override
 	protected double calc(double[] parameters) throws MathCalcError {
 		if (parameters.length!=1) throw error();
-		return Math.sin(parameters[0]);
+		final double d=Math.sin(parameters[0]);
+		return (Math.abs(d)<2E-16)?0.0:d;
 	}
 
 	@Override
 	protected double calcOrDefault(final double[] parameters, final double fallbackValue) {
 		if (parameters.length!=1) return fallbackValue;
-		return Math.sin(parameters[0]);
+		final double d=Math.sin(parameters[0]);
+		return (Math.abs(d)<2E-16)?0.0:d;
 	}
 
 	@Override