From d7bc0d9f9bf2b12bd8e013cf209db607b043ecf1 Mon Sep 17 00:00:00 2001
From: Iaroslav Postovalov <postovalovya@gmail.com>
Date: Wed, 29 Jul 2020 23:44:55 +0700
Subject: [PATCH] Make div/rem operators because of consistency, minor
 BigNumbers refactor

---
 .../kmath/operations/OptionalOperations.kt          |  8 ++++----
 .../scientifik/kmath/operations/BigNumbers.kt       | 13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/kmath-core/src/commonMain/kotlin/scientifik/kmath/operations/OptionalOperations.kt b/kmath-core/src/commonMain/kotlin/scientifik/kmath/operations/OptionalOperations.kt
index 21a263ebd..5b44fe964 100644
--- a/kmath-core/src/commonMain/kotlin/scientifik/kmath/operations/OptionalOperations.kt
+++ b/kmath-core/src/commonMain/kotlin/scientifik/kmath/operations/OptionalOperations.kt
@@ -87,16 +87,16 @@ interface RemainderDivisionOperations<T> : RingOperations<T> {
     /**
      * Calculates the remainder of dividing this value by [arg].
      */
-    infix fun T.rem(arg: T): T
+    operator fun T.rem(arg: T): T
 
     /**
      * Performs the floored division of this value by [arg].
      */
-    infix fun T.div(arg: T): T
+    operator fun T.div(arg: T): T
 
     override fun binaryOperation(operation: String, left: T, right: T): T = when (operation) {
-        REM_OPERATION -> left rem right
-        DIV_OPERATION -> left div right
+        REM_OPERATION -> left % right
+        DIV_OPERATION -> left / right
         else -> super.binaryOperation(operation, left, right)
     }
 
diff --git a/kmath-core/src/jvmMain/kotlin/scientifik/kmath/operations/BigNumbers.kt b/kmath-core/src/jvmMain/kotlin/scientifik/kmath/operations/BigNumbers.kt
index a0c9c9202..71fcc4518 100644
--- a/kmath-core/src/jvmMain/kotlin/scientifik/kmath/operations/BigNumbers.kt
+++ b/kmath-core/src/jvmMain/kotlin/scientifik/kmath/operations/BigNumbers.kt
@@ -14,14 +14,15 @@ object JBigIntegerField : Ring<BigInteger>, RemainderDivisionOperations<BigInteg
     override val one: BigInteger
         get() = BigInteger.ONE
 
-    override fun number(value: Number): BigInteger = BigInteger.valueOf(value.toLong())
+    override fun number(value: Number): BigInteger = value.toLong().toBigInteger()
     override fun add(a: BigInteger, b: BigInteger): BigInteger = a.add(b)
-    override fun BigInteger.minus(b: BigInteger): BigInteger = this.subtract(b)
-    override fun multiply(a: BigInteger, k: Number): BigInteger = a.multiply(k.toInt().toBigInteger())
+    override fun BigInteger.minus(b: BigInteger): BigInteger = subtract(b)
+    override fun multiply(a: BigInteger, k: Number): BigInteger = a.multiply(k.toLong().toBigInteger())
     override fun multiply(a: BigInteger, b: BigInteger): BigInteger = a.multiply(b)
     override fun BigInteger.unaryMinus(): BigInteger = negate()
-    override infix fun BigInteger.div(arg: BigInteger): BigInteger = this.divide(arg)
-    override infix fun BigInteger.rem(arg: BigInteger): BigInteger = remainder(arg)
+    override fun BigInteger.div(arg: BigInteger): BigInteger = divide(arg)
+    override fun BigInteger.div(k: Number): BigInteger = this / k.toLong().toBigInteger()
+    override fun BigInteger.rem(arg: BigInteger): BigInteger = remainder(arg)
 }
 
 /**
@@ -38,7 +39,7 @@ abstract class JBigDecimalFieldBase internal constructor(val mathContext: MathCo
 
     override fun add(a: BigDecimal, b: BigDecimal): BigDecimal = a.add(b)
     override fun BigDecimal.minus(b: BigDecimal): BigDecimal = subtract(b)
-    override fun number(value: Number): BigDecimal = BigDecimal.valueOf(value.toDouble())
+    override fun number(value: Number): BigDecimal = value.toDouble().toBigDecimal(mathContext)
 
     override fun multiply(a: BigDecimal, k: Number): BigDecimal =
         a.multiply(k.toDouble().toBigDecimal(mathContext), mathContext)