Merge branch 'main' into task/modInverse

ionspin · Jul 14, 2024 · b367ea8 · b367ea8
2 parents 76fedc4 + 2ebf683
commit b367ea8
Show file tree

Hide file tree

Showing 16 changed files with 445 additions and 3,243 deletions.
diff --git a/.github/workflows/github-pull-request-build.yml b/.github/workflows/github-pull-request-build.yml
@@ -0,0 +1,50 @@
+
+name: Build project and run tests.
+run-name: ${{ github.actor }} pull request
+on:
+  pull_request:
+    branches:
+      - main
+
+env:
+  CHROME_BIN: "chrome"
+jobs:
+  Build-And-Test-Linux:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: browser-actions/setup-chrome@v1
+      - run:  ./linuxBuild.sh
+  Build-And-Test-Mac:
+    runs-on: macos-latest
+    steps:
+      - name: Setup java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: browser-actions/setup-chrome@v1
+      - run:  ./macBuild.sh
+  Build-And-Test-Windows:
+    runs-on: windows-latest
+    steps:
+      - name: Setup java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: msys2/setup-msys2@v2
+      - uses: browser-actions/setup-chrome@v1
+      - shell: msys2 {0}
+        run:  |
+          ./windowsBuild.sh
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ build/
 /buildSrc/out
 /bignum/node_modules
 zignum/
+.kotlin/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@
 
 ##### 0.3.10-SNAPSHOT - current snapshot
 - Fix for #280, return byte array containing zero instead of empty array when big integer is zero.
+- Fix for #291, override hashCode as well as equals in ModularBigInteger
+- Fix for #292, negate for Modular big intiger did nothing.
+- Bump to kotlin 2.0.0
+- Add github action for pull request build and test.
+
 
 ##### 0.3.9 - 28.1.2024
 - Bump to kotlin 1.9.21

diff --git a/bignum/build.gradle.kts b/bignum/build.gradle.kts
@@ -117,7 +117,6 @@ kotlin {
     if (hostOs == HostOs.LINUX) {
         linuxX64("linux")
         if (ideaActive.not()) {
-            linuxArm32Hfp()
             linuxArm64()
             androidNativeX64()
             androidNativeX86()
@@ -225,14 +224,6 @@ kotlin {
 
             if (ideaActive.not()) {
 
-                val linuxArm32HfpMain by getting {
-                    dependsOn(nativeMain)
-                }
-
-                val linuxArm32HfpTest by getting {
-                    dependsOn(nativeTest)
-                }
-
                 val linuxArm64Main by getting {
                     dependsOn(nativeMain)
                 }

diff --git a/bignum/src/commonMain/kotlin/com/ionspin/kotlin/bignum/decimal/BigDecimal.kt b/bignum/src/commonMain/kotlin/com/ionspin/kotlin/bignum/decimal/BigDecimal.kt
@@ -385,7 +385,7 @@ class BigDecimal private constructor(
             exponent: Long,
             decimalMode: DecimalMode
         ): BigDecimal {
-            if (significand == BigInteger.ZERO) {
+            if (significand.isZero()) {
                 return BigDecimal(BigInteger.ZERO, exponent, decimalMode)
             }
             val significandDigits = significand.numberOfDecimalDigits()
@@ -395,7 +395,7 @@ class BigDecimal private constructor(
                 decimalMode.decimalPrecision
             }
             return when {
-                desiredPrecision > significandDigits -> {
+                desiredPrecision > significandDigits && !decimalMode.usingScale -> {
                     val extendedSignificand = significand * BigInteger.TEN.pow(desiredPrecision - significandDigits)
                     BigDecimal(extendedSignificand, exponent, decimalMode)
                 }
@@ -1096,10 +1096,10 @@ class BigDecimal private constructor(
      */
     fun add(other: BigDecimal, decimalMode: DecimalMode? = null): BigDecimal {
         val resolvedDecimalMode = resolveDecimalMode(this.decimalMode, other.decimalMode, decimalMode)
-        if (this == ZERO) {
+        if (this.isZero()) {
             return roundOrDont(other.significand, other.exponent, resolvedDecimalMode)
         }
-        if (other == ZERO) {
+        if (other.isZero()) {
             return roundOrDont(this.significand, this.exponent, resolvedDecimalMode)
         }
         val (first, second, _) = bringSignificandToSameExponent(this, other)
@@ -1153,10 +1153,10 @@ class BigDecimal private constructor(
     fun subtract(other: BigDecimal, decimalMode: DecimalMode? = null): BigDecimal {
         val resolvedDecimalMode = resolveDecimalMode(this.decimalMode, other.decimalMode, decimalMode)
 
-        if (this == ZERO) {
+        if (this.isZero()) {
             return roundOrDont(other.significand.negate(), other.exponent, resolvedDecimalMode)
         }
-        if (other == ZERO) {
+        if (other.isZero()) {
             return roundOrDont(this.significand, this.exponent, resolvedDecimalMode)
         }
 
@@ -1514,7 +1514,7 @@ class BigDecimal private constructor(
      * the same number i.e. 1.234
      */
     private fun removeTrailingZeroes(bigDecimal: BigDecimal): BigDecimal {
-        if (bigDecimal == ZERO) return this
+        if (bigDecimal.isZero()) return this
         var significand = bigDecimal.significand
         var divisionResult = BigInteger.QuotientAndRemainder(bigDecimal.significand, BigInteger.ZERO)
         do {
@@ -1657,7 +1657,7 @@ class BigDecimal private constructor(
      * as division.
      */
     override fun pow(exponent: Long): BigDecimal {
-        if (this == ZERO && exponent < 0) {
+        if (this.isZero() && exponent < 0) {
             throw ArithmeticException("Negative exponentiation of zero is not defined.")
         }
         var result = this
@@ -2167,7 +2167,7 @@ class BigDecimal private constructor(
     }
 
     override fun hashCode(): Int {
-        if (this == ZERO) {
+        if (this.isZero()) {
             return 0
         }
         return removeTrailingZeroes(this).significand.hashCode() + exponent.hashCode()
@@ -2253,7 +2253,7 @@ class BigDecimal private constructor(
      * i.e. 123000000 for 1.23E+9 or 0.00000000123 for 1.23E-9
      */
     fun toStringExpanded(): String {
-        if (this == ZERO) {
+        if (this.isZero()) {
             return "0"
         }
         val digits = significand.numberOfDecimalDigits()

diff --git a/bignum/src/commonMain/kotlin/com/ionspin/kotlin/bignum/integer/BigInteger.kt b/bignum/src/commonMain/kotlin/com/ionspin/kotlin/bignum/integer/BigInteger.kt
@@ -25,6 +25,7 @@ import com.ionspin.kotlin.bignum.CommonBigNumberOperations
 import com.ionspin.kotlin.bignum.NarrowingOperations
 import com.ionspin.kotlin.bignum.decimal.BigDecimal
 import com.ionspin.kotlin.bignum.integer.base63.array.BigInteger63Arithmetic
+import com.ionspin.kotlin.bignum.integer.base63.array.BigInteger63Arithmetic.compareTo
 import com.ionspin.kotlin.bignum.modular.ModularBigInteger
 import kotlin.math.ceil
 import kotlin.math.floor
@@ -272,14 +273,14 @@ class BigInteger internal constructor(wordArray: WordArray, requestedSign: Sign)
     }
 
     override fun subtract(other: BigInteger): BigInteger {
-        val comparison = arithmetic.compare(this.magnitude, other.magnitude)
-        if (this == ZERO) {
+        if (this.isZero()) {
             return other.negate()
         }
-        if (other == ZERO) {
+        if (other.isZero()) {
             return this
         }
         return if (other.sign == this.sign) {
+            val comparison = arithmetic.compare(this.magnitude, other.magnitude)
             when {
                 comparison > 0 -> {
                     BigInteger(arithmetic.subtract(this.magnitude, other.magnitude), sign)
@@ -506,7 +507,7 @@ class BigInteger internal constructor(wordArray: WordArray, requestedSign: Sign)
     }
 
     fun pow(exponent: BigInteger): BigInteger {
-        if (exponent < ZERO)
+        if (exponent.isNegative)
             throw ArithmeticException("Negative exponent not supported with BigInteger")
 
         if (exponent <= Long.MAX_VALUE) {
@@ -518,9 +519,9 @@ class BigInteger internal constructor(wordArray: WordArray, requestedSign: Sign)
 
     private tailrec fun exponentiationBySquaring(y: BigInteger, x: BigInteger, n: BigInteger): BigInteger {
         return when {
-            n == ZERO -> y
+            n.isZero() -> y
             n == ONE -> x * y
-            n.mod(TWO) == ZERO -> exponentiationBySquaring(y, x * x, n / 2)
+            n.mod(TWO).isZero() -> exponentiationBySquaring(y, x * x, n / 2)
             else -> exponentiationBySquaring(x * y, x * x, (n - 1) / 2)
         }
     }
@@ -529,9 +530,9 @@ class BigInteger internal constructor(wordArray: WordArray, requestedSign: Sign)
         if (exponent < 0) {
             throw ArithmeticException("Negative exponent not supported with BigInteger")
         }
-        return when (this) {
-            ZERO -> ZERO
-            ONE -> ONE
+        return when {
+            isZero() -> ZERO
+            this == ONE -> ONE
             else -> {
                 val sign = if (sign == Sign.NEGATIVE) {
                     if (exponent % 2 == 0L) {
@@ -573,8 +574,14 @@ class BigInteger internal constructor(wordArray: WordArray, requestedSign: Sign)
         if (isZero()) {
             return 1
         }
-        val bitLength = arithmetic.bitLength(magnitude)
-        val minDigit = ceil((bitLength - 1) * LOG_10_OF_2)
+        // Search through firsts powersOf10
+        val powersOf10 = BigInteger63Arithmetic.powersOf10
+        val quickSearch = powersOf10.indexOfFirst { it > magnitude }
+        if (quickSearch != -1) {
+            return quickSearch.toLong()
+        }
+//        val bitLength = arithmetic.bitLength(magnitude)
+//        val minDigit = ceil((bitLength - 1) * LOG_10_OF_2)
 //        val maxDigit = floor(bitLenght * LOG_10_OF_2) + 1
 //        val correct = this / 10.toBigInteger().pow(maxDigit.toInt())
 //        return when {
@@ -583,13 +590,13 @@ class BigInteger internal constructor(wordArray: WordArray, requestedSign: Sign)
 //            else -> -1
 //        }
 
-        var tmp = this / 10.toBigInteger().pow(minDigit.toInt())
+        var tmp = this / TEN.pow(powersOf10.size)
         var counter = 0L
-        while (tmp.compareTo(0) != 0) {
+        while (!tmp.isZero()) {
             tmp /= 10
             counter++
         }
-        return counter + minDigit.toInt()
+        return counter + powersOf10.size
     }
 
     override infix fun shl(places: Int): BigInteger {
@@ -770,7 +777,7 @@ class BigInteger internal constructor(wordArray: WordArray, requestedSign: Sign)
 
     // TODO eh
     operator fun times(char: Char): String {
-        if (this < 0) {
+        if (this.isNegative) {
             throw RuntimeException("Char cannot be multiplied with negative number")
         }
         var counter = this

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,17 +20,14 @@ buildscript {
 
     repositories {
         mavenCentral()
-        gradlePluginPortal()
     }
 
     dependencies {
-//        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:${Versions.dokkaPlugin}")
     }
 }
 
 allprojects {
-
     repositories {
         mavenCentral()
         maven {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -20,6 +20,12 @@ plugins {
     `kotlin-dsl`
 }
 
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+}
+
 repositories {
     mavenCentral()
 }
diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
@@ -16,9 +16,9 @@
  */
 
 object Versions {
-    val kotlinCoroutines = "1.8.0-RC2"
-    val kotlin = "1.9.21"
-    val kotlinSerialization = "1.6.2"
+    val kotlinCoroutines = "1.9.0-RC"
+    val kotlin = "2.0.0"
+    val kotlinSerialization = "1.7.1"
     val dokkaPlugin = "1.9.10"
 }