From 65370f93fb0f425d9c9ed0bc6bb5cbd9a049e47b Mon Sep 17 00:00:00 2001
From: Iaroslav <postovalovya@gmail.com>
Date: Mon, 8 Jun 2020 23:18:08 +0700
Subject: [PATCH] Make algebra and constants protected, fix tests

---
 .../scientifik/kmath/expressions/AsmExpressions.kt   |  4 ++--
 .../kotlin/scientifik/kmath/expressions/AsmTest.kt   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kmath-asm/src/main/kotlin/scientifik/kmath/expressions/AsmExpressions.kt b/kmath-asm/src/main/kotlin/scientifik/kmath/expressions/AsmExpressions.kt
index cc861d363..fc7788589 100644
--- a/kmath-asm/src/main/kotlin/scientifik/kmath/expressions/AsmExpressions.kt
+++ b/kmath-asm/src/main/kotlin/scientifik/kmath/expressions/AsmExpressions.kt
@@ -3,8 +3,8 @@ package scientifik.kmath.expressions
 import scientifik.kmath.operations.*
 
 abstract class AsmCompiledExpression<T> internal constructor(
-    @JvmField private val algebra: Algebra<T>,
-    @JvmField private val constants: MutableList<out Any>
+    @JvmField protected val algebra: Algebra<T>,
+    @JvmField protected val constants: MutableList<out Any>
 ) : Expression<T> {
     abstract override fun invoke(arguments: Map<String, T>): T
 }
diff --git a/kmath-asm/src/test/kotlin/scientifik/kmath/expressions/AsmTest.kt b/kmath-asm/src/test/kotlin/scientifik/kmath/expressions/AsmTest.kt
index 4370029f6..437fd158f 100644
--- a/kmath-asm/src/test/kotlin/scientifik/kmath/expressions/AsmTest.kt
+++ b/kmath-asm/src/test/kotlin/scientifik/kmath/expressions/AsmTest.kt
@@ -31,7 +31,7 @@ class AsmTest {
     @Test
     fun testSum() = testDoubleExpressionValue(
         25.0,
-        AsmSumExpression(AsmConstantExpression(1.0), AsmVariableExpression("x")),
+        AsmSumExpression(RealField, AsmConstantExpression(1.0), AsmVariableExpression("x")),
         mapOf("x" to 24.0)
     )
 
@@ -45,28 +45,28 @@ class AsmTest {
     @Test
     fun testDiv(): Unit = testDoubleExpressionValue(
         0.5,
-        AsmDivExpression(AsmConstantExpression(1.0), AsmConstantExpression(2.0)),
+        AsmDivExpression(RealField, AsmConstantExpression(1.0), AsmConstantExpression(2.0)),
         mapOf()
     )
 
     @Test
     fun testProduct(): Unit = testDoubleExpressionValue(
         25.0,
-        AsmProductExpression(AsmVariableExpression("x"), AsmVariableExpression("x")),
+        AsmProductExpression(RealField,AsmVariableExpression("x"), AsmVariableExpression("x")),
         mapOf("x" to 5.0)
     )
 
     @Test
     fun testCProduct(): Unit = testDoubleExpressionValue(
         25.0,
-        AsmConstProductExpression(AsmVariableExpression("x"), 5.0),
+        AsmConstProductExpression(RealField,AsmVariableExpression("x"), 5.0),
         mapOf("x" to 5.0)
     )
 
     @Test
     fun testCProductWithOtherTypeNumber(): Unit = testDoubleExpressionValue(
         25.0,
-        AsmConstProductExpression(AsmVariableExpression("x"), 5f),
+        AsmConstProductExpression(RealField,AsmVariableExpression("x"), 5f),
         mapOf("x" to 5.0)
     )
 
@@ -83,7 +83,7 @@ class AsmTest {
     @Test
     fun testCProductWithCustomTypeNumber(): Unit = testDoubleExpressionValue(
         0.0,
-        AsmConstProductExpression(AsmVariableExpression("x"), CustomZero),
+        AsmConstProductExpression(RealField,AsmVariableExpression("x"), CustomZero),
         mapOf("x" to 5.0)
     )