chore: var renames, use method in test

lbressler13 · Jan 23, 2024 · f02a2c6 · f02a2c6
1 parent a5b611b
commit f02a2c6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/exact-numbers/src/main/kotlin/xyz/lbres/exactnumbers/exactfraction/ExactFractionImpl.kt b/exact-numbers/src/main/kotlin/xyz/lbres/exactnumbers/exactfraction/ExactFractionImpl.kt
@@ -57,8 +57,8 @@ internal class ExactFractionImpl private constructor(numerator: BigInteger, deno
 
     override fun inverse(): ExactFraction {
         return when {
-            numerator.isZero() -> throw divideByZero
-            numerator.isNegative() -> ExactFractionImpl(-denominator, -numerator, fullySimplified = true)
+            isZero() -> throw divideByZero
+            isNegative() -> ExactFractionImpl(-denominator, -numerator, fullySimplified = true)
             else -> ExactFractionImpl(denominator, numerator, fullySimplified = true)
         }
     }

diff --git a/...rs/src/main/kotlin/xyz/lbres/exactnumbers/exactfraction/ExactFractionOverflowException.kt b/...rs/src/main/kotlin/xyz/lbres/exactnumbers/exactfraction/ExactFractionOverflowException.kt
@@ -2,7 +2,7 @@ package xyz.lbres.exactnumbers.exactfraction
 
 /**
  * [ArithmeticException] for ExactFraction overflow.
- * Has field for value of string that caused overflow.
+ * Has field for string of value that caused overflow.
  */
 class ExactFractionOverflowException() : ArithmeticException() {
     override var message: String? = null

diff --git a/exact-numbers/src/main/kotlin/xyz/lbres/exactnumbers/exactfraction/exactFractionHelpers.kt b/exact-numbers/src/main/kotlin/xyz/lbres/exactnumbers/exactfraction/exactFractionHelpers.kt
@@ -9,7 +9,7 @@ import java.math.MathContext
 import java.math.RoundingMode
 
 /**
- * Simplify a numerator and denominator values to smallest values with same ratio, and move all negatives into numerator
+ * Simplify numerator and denominator values to smallest values with same ratio, and move all negatives into numerator
  *
  * @param numerator [BigInteger]: numerator of fraction to simplify
  * @param denominator [BigInteger]: denominator of fraction to simplify

diff --git a/exact-numbers/src/main/kotlin/xyz/lbres/exactnumbers/exactfraction/exactFractionParsing.kt b/exact-numbers/src/main/kotlin/xyz/lbres/exactnumbers/exactfraction/exactFractionParsing.kt
@@ -33,8 +33,8 @@ internal fun parseDecimal(s: String): ExactFraction {
     val decimalIndex = rawDecimalString.indexOf('.')
     val decimalString = rawDecimalString.substring(decimalIndex + 1) // starts from 0 if decimalIndex == -1
 
-    val zeros = "0".repeat(decimalString.length)
-    val denomString = "1$zeros"
+    val denomZeroes = "0".repeat(decimalString.length)
+    val denomString = "1$denomZeroes"
 
     val denominator = BigInteger(denomString)
     val numerator = whole * denominator + BigInteger(decimalString)

diff --git a/exact-numbers/src/main/kotlin/xyz/lbres/exactnumbers/irrationals/log/Log.kt b/exact-numbers/src/main/kotlin/xyz/lbres/exactnumbers/irrationals/log/Log.kt
@@ -4,7 +4,6 @@ import xyz.lbres.exactnumbers.exactfraction.ExactFraction
 import xyz.lbres.exactnumbers.irrationals.IrrationalNumber
 import xyz.lbres.kotlinutils.collection.ext.toConstMultiSet
 import xyz.lbres.kotlinutils.general.simpleIf
-import xyz.lbres.kotlinutils.set.multiset.anyConsistent
 import xyz.lbres.kotlinutils.set.multiset.const.ConstMultiSet
 import xyz.lbres.kotlinutils.set.multiset.const.ConstMutableMultiSet
 import xyz.lbres.kotlinutils.set.multiset.const.constMutableMultiSetOf
@@ -41,9 +40,8 @@ sealed class Log : IrrationalNumber<Log>() {
          */
         // TODO: improve simplification by looking at bases
         internal fun simplifySet(numbers: ConstMultiSet<Log>): Pair<ExactFraction, ConstMultiSet<Log>> {
-            when {
-                numbers.isEmpty() -> return Pair(ExactFraction.ONE, emptyConstMultiSet())
-                numbers.anyConsistent(Log::isZero) -> return Pair(ExactFraction.ZERO, emptyConstMultiSet())
+            if (numbers.isEmpty()) {
+                return Pair(ExactFraction.ONE, emptyConstMultiSet())
             }
 
             val simplifiedNumbers = numbers.mapToSetConsistent { it.getSimplified() }

diff --git a/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/exactfraction/ExactFractionTest.kt b/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/exactfraction/ExactFractionTest.kt
@@ -38,7 +38,7 @@ class ExactFractionTest {
     @Test fun testIsWholeNumber() = runIsWholeNumberTests()
 
     // parsing + toString
-    @Test fun testIsEFString() = runCommonCheckEFStringTests { ExactFraction.isEFString(it) }
+    @Test fun testIsEFString() = runCommonCheckEFStringTests(ExactFraction.Companion::isEFString)
     @Test fun testToDecimalString() = runToDecimalStringTests()
     @Test fun testToFractionString() = runToFractionStringTests()
     @Test fun testToPairString() = runToPairStringTests()