Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-18 16:25:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(evaluator): Improve sin and cos threshold values

Browse Source 
Signed-off-by: Myzel394 <50424412+Myzel394@users.noreply.github.com>
This commit is contained in:
Myzel394 2024-07-21 18:55:12 +02:00
parent f313da7042
commit 5a9440dd17
No known key found for this signature in database
GPG Key ID: DEC4AAB876F73185
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
data/evaluatto/src/main/java/io/github/sadellie/evaluatto/BigDecimalMath.kt
View File

@ -26,9 +26,19 @@ import kotlin.math.asin
import kotlin.math.atan import kotlin.math.atan
import kotlin.math.pow import kotlin.math.pow
// Dirty hack to avoid -0.000000000001
val PI_THRESHOLD = BigDecimal("0.000000000000001")
internal fun BigDecimal.sin(radianMode: Boolean): BigDecimal { internal fun BigDecimal.sin(radianMode: Boolean): BigDecimal {
val angle: Double = if (radianMode) this.toDouble() else Math.toRadians(this.toDouble()) val angle: Double = if (radianMode) this.toDouble() else Math.toRadians(this.toDouble())
return kotlin.math.sin(angle).toBigDecimal()
val result = kotlin.math.sin(angle).toBigDecimal()
if (result.abs() < PI_THRESHOLD) {
return BigDecimal.ZERO
}
return result
} }
internal fun BigDecimal.arsin(radianMode: Boolean): BigDecimal { internal fun BigDecimal.arsin(radianMode: Boolean): BigDecimal {
@ -38,7 +48,14 @@ internal fun BigDecimal.arsin(radianMode: Boolean): BigDecimal {
internal fun BigDecimal.cos(radianMode: Boolean): BigDecimal { internal fun BigDecimal.cos(radianMode: Boolean): BigDecimal {
val angle: Double = if (radianMode) this.toDouble() else Math.toRadians(this.toDouble()) val angle: Double = if (radianMode) this.toDouble() else Math.toRadians(this.toDouble())
return kotlin.math.cos(angle).toBigDecimal()
val result = kotlin.math.cos(angle).toBigDecimal()
if (result.abs() < PI_THRESHOLD) {
return BigDecimal.ZERO
}
return result
} }
internal fun BigDecimal.arcos(radianMode: Boolean): BigDecimal { internal fun BigDecimal.arcos(radianMode: Boolean): BigDecimal {

7
data/evaluatto/src/main/java/io/github/sadellie/evaluatto/Expression.kt
View File

@ -93,6 +93,10 @@ class Expression(
} }
moveIfMatched(Token.Operator.divide) -> { moveIfMatched(Token.Operator.divide) -> {
// Adding those `setScale` calls have been added in
// 36a931c7d175b5cad52ff3abceb7784b0bb82aac to fix #18
// I'm not sure if this is the correct way to fix it, but it
// seems to be working
val divisor = parseFactor().setScale(MAX_PRECISION) val divisor = parseFactor().setScale(MAX_PRECISION)
if (divisor.compareTo(BigDecimal.ZERO) == 0) throw ExpressionException.DivideByZero() if (divisor.compareTo(BigDecimal.ZERO) == 0) throw ExpressionException.DivideByZero()
@ -166,7 +170,8 @@ class Expression(
// sin // sin
if (moveIfMatched(Token.Func.sin)) { if (moveIfMatched(Token.Func.sin)) {
expr = parseFuncParentheses().sin(radianMode) val x = parseFuncParentheses()
expr = x.sin(radianMode)
} }
// cos // cos